diff options
| author | Beth Thibodeau <ethibodeau@google.com> | 2020-06-12 01:41:39 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-12 01:41:39 +0000 |
| commit | a2138914e0ef9d59fccf7729841a74d52e0f1995 (patch) | |
| tree | 3a22199dc9659e6be7a5c114178e141602facbed /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 45d30f78e9c6e3e5f90cd6769e3a376d9ad2e442 (diff) | |
| parent | 42d7447d486a2a4b410296181cc8bd02f6587a30 (diff) | |
Merge "Reset media controls when user changes" into rvc-dev am: 4e86ccd2e6 am: ba9d30d6e0 am: 46580d2c83 am: 42d7447d48
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11813680
Change-Id: Ia7c641cd40f6157977b26d79b54cd92eb2414fae
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions