diff options
| author | Zoey Chen <zoeychen@google.com> | 2019-12-05 00:44:03 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-12-05 00:44:03 -0800 |
| commit | 532a710d88672b6ab0876f6f06c5ce18e5859092 (patch) | |
| tree | 6290eb55dd772936061428527f719c6feac9c6e3 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 6d32634b8ac156b01de54fc0ffaed561df477500 (diff) | |
| parent | 81748882c8c5876f8cb14a7277fe6b494741ba52 (diff) | |
[automerger skipped] Merge "[Telephony mainline] Move #dataStateToString and #getNetworkTypeName to calling location" am: ace1a65025 am: 9359013f8d
am: 81748882c8 -s ours
am skip reason: change_id I907f539018c29fc2eb5b13c50d5585a56a7bdc0a with SHA1 c722b456f7 is in history
Change-Id: I495cd266db9274c8957f0e1e414d295e9e3f4594
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions