diff options
| author | Fabian Kozynski <kozynski@google.com> | 2020-07-23 14:22:47 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-23 14:22:47 +0000 |
| commit | 11b2d2d073dd5b055ae51c56120d5cd35e70aaa3 (patch) | |
| tree | 3db9508832f0337ba76ea41f053b3bc029532eeb /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | a02c2b898243829805595666f61174e7c529fafb (diff) | |
| parent | 974eefa7793eebcac026f769aaf72c349a86072c (diff) | |
[automerger skipped] Merge changes from topic "permission_chip" into rvc-qpr-dev am: 9a85dc9c0a am: 974eefa779 -s ours
am skip reason: Change-Id I871094c32ce5ec940d779626333caa0ca500a4e3 with SHA-1 fe4b8c2627 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12130778
Change-Id: Ibd16022e6d34e4fc9d137741fc1a3b14de50bf9f
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions