diff options
author | Mady Mellor <madym@google.com> | 2019-10-08 23:17:57 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-10-08 23:17:57 -0700 |
commit | 45d3f2fb87e41322229a03b1dad1ae67d0803bb2 (patch) | |
tree | d876ed3fdee9996d06c10d436d8008fc997dee96 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 7ab07e56fe3240d09990309985d92cd62b2aab4a (diff) | |
parent | 4b25085ee741b8dfa8d9068e74f749344f2805e0 (diff) |
[automerger skipped] Merge "DO NOT MERGE Update setting to be bubbles not badging" into qt-qpr1-dev am: 0afaedd52f
am: 4b25085ee7 -s ours
am skip reason: subject contains skip directive
Change-Id: Ia743e2c0be3ceaed3eb0a1cfc0f50acb54751482
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions