diff options
author | Patrick Huang <pinchin@google.com> | 2019-09-09 12:20:48 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-09-09 12:20:48 -0700 |
commit | 48fcc4d753f09c2adfb07758eb0b7cf56bb387cf (patch) | |
tree | db3c31ae1a3ed24c2173035708d5433fc3a2f54a /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | ded4f36e722c21004576b0d9d482e5d45e1fa2f6 (diff) | |
parent | 00c3767ce29a5cb070898513343929ba2750d776 (diff) |
[automerger skipped] Merge "Add TelephonyManager APIs to take physical slotIndex - getSimCardState - getSimApplicationState" am: 4ed6876df1 am: 3e837c4822 am: 38e5aa08d0
am: 00c3767ce2 -s ours
am skip reason: change_id I72612afb9f8ff3d898db99afaaee0c0d3654f754 with SHA1 f7f87dd1c9 is in history
Change-Id: Id695d1cf8fdcb13c69b0693a7ac5830b5c804b7e
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions