diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-09-02 19:40:42 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-02 19:40:42 +0000 |
commit | ce81c5a4202473c127b138be0dde0f35cd85d626 (patch) | |
tree | f2d6c4077bc35ce34b940c85a135bb312bf07d67 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 26a58d39ec56b9a85d63c40b1690e71f7d6275b7 (diff) | |
parent | 14aac87b1a9c46495b7716ad698cfffb5be6c7af (diff) |
[automerger skipped] Merge "Fix NavigationBarColorTest" into stage-aosp-master am: cf7c807eea -s ours am: 14aac87b1a -s ours
am skip reason: Change-Id I68db516c91da69e0f4dcbdfab6d6a757c4cdc75b with SHA-1 588fa46cf4 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12513856
Change-Id: Iaa2b910bbb6fa3df532949722c86fc3326a51eb5
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions