diff options
author | Anton Hansson <hansson@google.com> | 2021-02-04 01:16:35 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-04 01:16:35 +0000 |
commit | eddb59803a08b5c0ee98cc789eed94ddd9e7141d (patch) | |
tree | c1961b6b931dbe1a6c5c4b7665701770eb313b43 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 6f77e64608c5ffe7496b7e7f5eeb8cf636c639de (diff) | |
parent | 1467d174dff1f5ed2867917fc1026e456776c765 (diff) |
[automerger skipped] Merge changes from topic "presubmit-am-a914d38dbf2a4fd283cd25bda2526870" into mainline-prod am: 1467d174df -s ours
am skip reason: Change-Id I2dcf7f0f24948422e0ffd4880846313a75d467d2 with SHA-1 09e4eb17ba is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13436473
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4e280b7c7de2f0d14c8968252ad2dea6d2fa25f3
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions