diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-29 20:40:50 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-29 20:40:50 +0000 |
commit | 23a649d1456789b3a4c79e6797b80733ebe00087 (patch) | |
tree | 95fa4f48bcf5fea2242405efc27973eaef7435a5 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 9feaec4a3f52d4e8b4c7354a200d66a322e36edd (diff) | |
parent | 95f9570c5d828197fb0918999a9b874f4f6db12a (diff) |
[automerger skipped] Merge "Do not animate padlock when fp" into rvc-d1-dev am: 3457f40589 am: cf15d4c609 -s ours am: 95f9570c5d -s ours
am skip reason: Change-Id If99d5b20d0f69491d38cfdbc21dfa8d2fe2d0edb with SHA-1 a7f7936590 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12257808
Change-Id: Ica58e3eb388661502010330eea8008f44ecd325e
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions