diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-10 01:44:53 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-10 01:44:53 +0000 |
| commit | 94bad10a0eca8c1dd9c98d7b7cacc0005b7e01cf (patch) | |
| tree | 0439e6cc4c96c63ce4b32f8c8cbf0195493aa746 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 2ce24e15fd6c61bd7c4d45b5b4266dec2f82c8db (diff) | |
| parent | 50c181623982916f417d3240fc19ba3ac9ece2cb (diff) | |
Merge "[automerger skipped] DO NOT MERGE Sanitize more of the notification text fields am: db023fcd73 am: 2d7d8c2604 am: 5b662fd7c1 -s ours am: 55f9c81eba -s ours am: f6d7b592ff am: 8084de65e4 -s ours am: 2d983eccad am: d1ff215c87" into rvc-d1-dev-plus-aosp am: 5ad3165f05 am: 50c1816239 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12512962
Change-Id: I15665cb687a7b155abe83bcc6b8b2b73e14a20ab
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions