diff options
| author | Nathan Harold <nharold@google.com> | 2020-07-09 18:14:37 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-09 18:14:37 +0000 |
| commit | cb431f96464cfd58200598cd83505638b044055f (patch) | |
| tree | 6c140d392fb048a4bebc54e6a38bb1b3b45bbcf5 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 3b7682b06db02e39b1c0b08b05fee7a99152b970 (diff) | |
| parent | 82f17301c23d852fdb719ce4ba51abad3a7c19df (diff) | |
Merge changes from topic "servicelocation" am: 63ced6b508 am: 0b41b930a8 am: dbe2b4c8a9 am: d307f437a6 am: 82f17301c2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1355808
Change-Id: Id7f6f8125ca3b648a62224593a33c82250258e7a
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions