diff options
author | Shuo Qian <shuoq@google.com> | 2020-11-13 18:05:50 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-13 18:05:50 +0000 |
commit | 5d5ff953200adae11d8f3db12a2ff90ccad1c18d (patch) | |
tree | a9c67af5427f20ba99bee82376a012dfdac8ffdc /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 64b1a6f481ee9e60cb109411370c8fd6fc90d8d4 (diff) | |
parent | 44cf38293451dbabb3c6c7664ac625f942a34aff (diff) |
[automerger skipped] Merge "Add TelephonyManager test hidden API for testing" am: 5815e26b3a am: 0f61c23c26 am: f3781d192d am: 44cf382934 -s ours
am skip reason: Change-Id I30a5b695770509dc803ab5623c75e653d40f4d11 with SHA-1 53cfc4a894 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1496912
Change-Id: Id23193c5428ddc0d9689274540364008662d2ee8
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions