diff options
| author | Orion Hodson <oth@google.com> | 2020-08-24 12:19:24 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-24 12:19:24 +0000 |
| commit | 374718a2a8c35c2f2384eeea0fb2f07a1ee4c50b (patch) | |
| tree | 261655cdb7774dd984fd789f7246f0ad5bf7eb5e /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 8517455df4c8ab186a7f2bb9f0f1376916ce44d5 (diff) | |
| parent | 08e54a12ecc0be6e84b9652871ee07807e5232ff (diff) | |
resolve merge conflicts of 525ed1c275ce445093448566eb72a55a1bdf939c to rvc-dev-plus-aosp am: be053b7e19 am: 08e54a12ec
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12432135
Change-Id: Ic8bb64248051e1c39469f6e585dafec7e03d66c0
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions