diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-08 05:28:00 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-08 05:28:00 +0000 |
| commit | 93344fe4bd75ba91eb768052a5067bc18583e1af (patch) | |
| tree | 5c4990d10db409cd2029866dabee25981afe66f0 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 763cb8f95c9f61ebeaf76f16d66881caba6f8cf4 (diff) | |
| parent | ad0dc8e4795bfc77f464c1d5d5c3bd7f262b0b03 (diff) | |
[automerger skipped] Merge "[Settings] Expose @hide #setDataAllowedDuringVoiceCall and #isDataAllowedInVoiceCall as @SystemApi" am: 3ba74ca897 am: d1c0f8faac am: ad0dc8e479 -s ours
am skip reason: Change-Id Ib0e6bfa01db9cfabae7ebcce4548dc885e589144 with SHA-1 66f08c4947 is in history
Change-Id: I2ebc8632a9365e0a4fbed4fbb2bc7b26e14f63b5
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions