diff options
author | Lucas Dupin <dupin@google.com> | 2020-08-29 03:49:31 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-29 03:49:31 +0000 |
commit | 9f9cb1a5c3f8f161b510d231a42320de6f218057 (patch) | |
tree | d3c6d2f67ca3a1c7b5ea5aab1fe880e113853fbd /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | e42a06cc75163491cc599dc02ea6c591574f44b0 (diff) | |
parent | 3df95b2207de2a16953f1b91efa7f4ed6b9083fa (diff) |
[automerger skipped] Merge "Require a more specific intent" into pi-dev am: 536cef1b06 -s ours am: 1d9d0f28e2 -s ours am: 03d8fff6fe -s ours am: 2535813dd5 -s ours am: 2c5a82c576 -s ours am: b64251436d -s ours am: 3df95b2207 -s ours
am skip reason: Change-Id I8f721ca659d58271880a7adbf386b270b331e55b with SHA-1 6dbda27f98 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12253519
Change-Id: Icb452e53fb6635e77e65aa9567ee1f9da8cca724
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions