diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-15 10:32:43 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-15 10:32:43 +0000 |
| commit | c4ce2b5165e45497e4341e3b067e741234cc9e7c (patch) | |
| tree | 35fc782d96b397a8b2140d5fa89331c8d812cfc8 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 481328dd816aa36952faca4d913679af68131921 (diff) | |
| parent | f5dfa714378ba527aece1a6d062a8022cca58f6b (diff) | |
Merge "Merge "Clear preferred feature when unregistering MediaRouter2" into rvc-dev am: e7ae494759 am: 8cb3412ac2 am: 6e5a9a1442" into rvc-qpr-dev-plus-aosp am: f5dfa71437
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11846909
Change-Id: Ie40809997d0388c6e5bc42794e26c4104a6832cc
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions