diff options
| author | Nathan Harold <nharold@google.com> | 2020-07-09 17:34:30 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-09 17:34:30 +0000 |
| commit | dbe2b4c8a989a5cb8bdfd7bcc7c3a4b3b6328935 (patch) | |
| tree | 7021d7c0c7c8caacbfd3ae1aca9a9a168bacb6d8 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | b169887af71044a79462158064c2f7d58c6aad7b (diff) | |
| parent | 0b41b930a84566af107e62c1b7cb2fb7b7f5a110 (diff) | |
Merge changes from topic "servicelocation" am: 63ced6b508 am: 0b41b930a8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1355808
Change-Id: I1992b4e1c9d7c2cf442515b4c397a9975478df85
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions