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