summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorBeth Thibodeau <ethibodeau@google.com>2020-06-12 01:42:08 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-12 01:42:08 +0000
commit28db2eaf1da2799eb05f44b87b9ffaef7878effc (patch)
tree3a22199dc9659e6be7a5c114178e141602facbed /tools/aapt2/java/JavaClassGenerator_test.cpp
parenta2138914e0ef9d59fccf7729841a74d52e0f1995 (diff)
parent8097fbc2215000a2dc5023559f1668f8a84d1750 (diff)
Merge "Reset media controls when user changes" into rvc-dev am: 4e86ccd2e6 am: a940158cdd am: 156fdd32af am: 8097fbc221
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11813680 Change-Id: I15e71ce70c7f13c2f1ab64449cadead5c3bf5be3
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions