diff options
| author | Sudheer Shanka <sudheersai@google.com> | 2021-08-13 22:11:05 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-13 22:11:05 +0000 |
| commit | 0aafd853cb1c8efd096b7f4cc16a3063c7566a61 (patch) | |
| tree | b61a52d9b167f344962dff10f9bdc33cd55df0c0 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 00e373f51d600cc0855c90993dfb93ff9ba2c659 (diff) | |
| parent | 1444f9907fd267359f75438e7f5a351e67ddc722 (diff) | |
[automerger skipped] Merge "Add SafetyNet logging if a certain broadcast is received by apps." into oc-mr1-dev am: 83f71f1227 -s ours am: b0fccf4d9d -s ours am: d95a81b720 -s ours am: a899051254 -s ours am: 2ea88737b2 -s ours am: 5833c655f9 -s ours am: cce33c3589 -s ours am: 1444f9907f -s ours
am skip reason: Merged-In I65b2e96ff1230b2051dd1e5bd9c21e5ba3e1146a with SHA-1 ad79043436 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15301699
Change-Id: I5fa86dc26d3f063375b970509259b04dc81423af
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions