diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-12 15:23:53 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-12 15:23:53 +0000 |
| commit | d0e083174cb7abdccb2060239c9c84e99f131b9f (patch) | |
| tree | e783e66afb06d9d40a4cb489bc477f489757bec1 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 477c2b80d545154edd5a4dfd97091c044760ac38 (diff) | |
| parent | 7dcf503836b69b76951e7b25e4a269f08611c9df (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 77e3cce083 -s ours am: e9fe9225e3 -s ours" into rvc-d1-dev-plus-aosp am: 7dcf503836 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12136585
Change-Id: I136f0cf75c341e5b8583147678b52288235786da
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions