diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-09-17 14:19:16 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-09-17 14:19:16 +0000 |
commit | a77d117fb282f4a6c9e99282b7ab3770a2c83924 (patch) | |
tree | 5bd429ad7312e50e7ff6fb2a2b6cf1751baf0db1 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 8fc910ff0dcad5eddeb7cdc6a2e273abc961cf72 (diff) | |
parent | ea3298f1fde94848746efeac7b004aa23ee731c9 (diff) |
[automerger skipped] Merge "Delay the transition to AOD1 if udfps is activated" into sc-dev am: 9a66f8324b -s ours am: ea3298f1fd -s ours
am skip reason: Merged-In I3a8168e6f1970c36717e0a7a223bcc74c3ec5600 with SHA-1 c87d7f79ca is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15838199
Change-Id: Icbb1158f12c0d5d5dc3914391abbf88c3cdb7454
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions