diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-03 21:02:04 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-03 21:02:04 +0000 |
commit | 21722db6c750a5c6fec2054e3489bf48635f8c7f (patch) | |
tree | 2179c39686e8c02dbcd7d75a9e8800b1141d32a5 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | ff8e9038dcd01d5af0bb9c126f8f65b736fcb6e6 (diff) | |
parent | 21808ade61a328cabb0db0856bc9fd02abeb17d5 (diff) |
Merge "Controls UI - Handle activity dismissal from dialog" into rvc-dev am: 84bc21cbec am: 6e7b3c21c4 am: 21808ade61
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11722398
Change-Id: Ia25fd2962b3f880e0e78867bc4a8efddc5a32ec5
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions