diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-24 17:58:32 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-06-24 17:58:32 +0000 |
| commit | c8cf2a5caef64e01b9fbf6533ccf7996c8e426c5 (patch) | |
| tree | 6a3e498bd58096602806ee53ba9591bd05021e41 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 4820f6745718d3c0fc1d6094a23e15b1f93f8c63 (diff) | |
| parent | 9356c82edbfeb138d982ebcfdb5c930e4ce9ab1d (diff) | |
Merge changes from topic "am-a6b16d02ad3a4958ac12da95de4c98eb" into rvc-qpr-dev-plus-aosp
* changes:
Merge "Flip ENABLE_DYNAMIC_PERMISSIONS, attempt #6." into rvc-dev am: 00c2e16b28 am: 5ccff32cdf am: 45dded218d
Merge "Relax locking for startActivityInPackage()." into rvc-dev am: 3c76edd5a3 am: 984ce387ce am: c04cd53974
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions