diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-11-06 04:24:37 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-06 04:24:37 +0000 |
| commit | 014fe5e136eca4d2e49d5152559394f806c641d3 (patch) | |
| tree | 3cdd22fde36481c2320441f36a44bc7eec77329b /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | e980626fb4f09514fcdd2a246b88c90784b624c2 (diff) | |
| parent | d39d8ce0333748dfc475e227c1a32b17d988837f (diff) | |
[automerger skipped] Merge changes from topic "12933388" into qt-dev am: ebf67ea3b2 am: da1ea4bc80 -s ours am: d39d8ce033 -s ours
am skip reason: Change-Id If3b420067b4d7111dcf67ae6f98e42176158b679 with SHA-1 33e24c883c is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12986651
Change-Id: I8f8568b88fa11511da685c05ac7cb4abdfb02b16
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions