diff options
| author | Grace Jia <xiaotonj@google.com> | 2021-05-03 22:49:09 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-03 22:49:09 +0000 |
| commit | f0d1132b23a1b2d82584d3ad924ae5fea4e2876f (patch) | |
| tree | adefe2f60a0c56093f1c2083e88704d25eed3173 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 11b91fa682ff7c6a839338eb1b03a64c9d73edd6 (diff) | |
| parent | 71de23564da289ba940388be7135e4b121c05eb7 (diff) | |
[automerger skipped] Merge "Add support for selected contacts device to device sharing." am: 83bc8699a1 am: a9a60d31bc am: 71de23564d -s ours
am skip reason: Merged-In I4f6da463a29ba9cf067d36941a9b4e584012c817 with SHA-1 2bd23cfbcc is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1694227
Change-Id: If875e37610b59e5643b886926d1eb0357a00f586
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions