diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-08 12:15:02 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-06-08 12:15:02 +0000 |
| commit | bd5658dcf3b43ad6d18c633b06221f0d51e896a9 (patch) | |
| tree | 254797498a86bccea2ce657a4dec70de12db91ad /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | e975dc06224f6c8d7ee138d665a4922d0ffad6f1 (diff) | |
| parent | 5080bca1c2b5bc7a7408b69a84684e45c7b7e44e (diff) | |
Merge changes from topic "am-50f43ad525e5485685514546a1930347" into rvc-qpr-dev-plus-aosp
* changes:
Merge "[DO NOT MERGE] Add setting custom MediaButtonReceiver" into rvc-dev am: 2ad21ed9dd am: acd84f39fa am: 4184badc95
[DO NOT MERGE] Add setting custom MediaButtonReceiver am: 7d8d596370 am: f9992179c7 am: 99a348c706
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions