diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-11-19 02:00:52 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-19 02:00:52 +0000 |
| commit | d994db3ad55a154e1c9207d93a877d7047dd3688 (patch) | |
| tree | 0f397e6dbe3ae02ed627f993c5a49d78fe3c104a /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 258212e7d47cfc6a981270de4713acccda8263ea (diff) | |
| parent | c520991743834a8ef27688e9ed5a121fdcb59e5c (diff) | |
[automerger skipped] Merge "Properly support handover retry" am: 514ab6f4c8 am: 357d7c3a04 am: aa4093a974 am: c520991743 -s ours
am skip reason: Change-Id I1ee4e638892bfdba19f368c5e2ae7ecaf2c7364c with SHA-1 70a214c6da is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1459486
Change-Id: I969b36f9a2d079ed746029f6e0260b800f1d4941
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions