diff options
| author | Hall Liu <hallliu@google.com> | 2019-11-12 15:25:47 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-11-12 15:25:47 -0800 |
| commit | cf6db591024bb2f7c53086d509b07fc1005258e0 (patch) | |
| tree | f95a240cadf5d7c90817f5505252eb2d65a6dc5e /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 2dbc22cb28f0a9493d881976de0933f0d6991fd1 (diff) | |
| parent | feb80c2665749779a17a8862d8e62f52fb5f34fd (diff) | |
[automerger skipped] Merge "Merge "Expose TelephonyManager#getDeviceSoftwareVersion(int) as system API." am: 096cd20182 am: dd1f02d02e" into qt-qpr1-dev-plus-aosp
am: feb80c2665 -s ours
am skip reason: change_id I1cddd570d5c1203ca749be0ac78093df9e97ee3b with SHA1 65f65b2d6d is in history
Change-Id: Id9c9c4d36e7f55f89f06616fc3216c7c93caa261
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions