diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-10-27 19:41:59 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-27 19:41:59 +0000 |
commit | c95fd08136b95cadc83031dad20fadf262fb8dd6 (patch) | |
tree | 70fafa1b9d868cc8c99f5fb1558a55eef2401fab /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 84b16f5e1480642d30cfa2b2631367d8ca016c69 (diff) | |
parent | e573aca07b35722ab924da55c0b81f8d974281c0 (diff) |
[automerger skipped] Merge changes from topic "BackportUiAutomatorRetry" am: ff062f6e73 am: ed29b2da3c am: 0c6faf40fd am: e573aca07b -s ours
am skip reason: Change-Id Ibf201fa042b80c067f2a0c3b0bde23adf9c60546 with SHA-1 0d94533ef9 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1471402
Change-Id: Iacd7fb1171543f5b54aeac79b7e160133983baf3
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions