diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-03 21:02:45 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-03 21:02:45 +0000 |
| commit | e111891c2259425191bd083498d903fb48853a9a (patch) | |
| tree | 2179c39686e8c02dbcd7d75a9e8800b1141d32a5 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 21722db6c750a5c6fec2054e3489bf48635f8c7f (diff) | |
| parent | 346df6401405d5486acee135b2ca0e9a5c398e65 (diff) | |
Merge "Merge "Controls UI - Handle activity dismissal from dialog" into rvc-dev am: 84bc21cbec am: 3d21ab95f0" into rvc-d1-dev-plus-aosp am: 346df64014
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11722398
Change-Id: I3a9b36ad40475f96d61ad3855a287f7164d87bfd
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions