summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorMakoto Onuki <omakoto@google.com>2021-03-09 02:19:25 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-03-09 02:19:25 +0000
commit245befadf137e65e5be6c257506513e535468974 (patch)
tree9be96599ae93883d42a16495ed50203966665ba9 /tools/aapt2/java/JavaClassGenerator.cpp
parentf5d4826ef14f1d1db1e11b5d2e38ade7fbf39e87 (diff)
parent8f8ffd02f28974a1dc5df2b1c1f22408f43be9dd (diff)
Merge "[Bugfix] Fix after performing adb shell am hang and kill this process, the phone can not resume from hang state" am: 4d83226663 am: 8f8ffd02f2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1601731 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ieff6dfbeda11d1ae6fd6cd9a28cd622f2cec7045
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions