diff options
| author | Shishir Agrawal <shishir@google.com> | 2016-02-24 17:42:33 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-02-24 17:42:33 +0000 |
| commit | 2f17c36268778a8158beb44b5d41c5960c6af7e0 (patch) | |
| tree | 398723c1eaf13b347d526eeb56134a6104e260f5 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 7aa999143f2a87d908cd1348dcee6c9ab06334c9 (diff) | |
| parent | d94fbf85d6b9affc29fb312abd3548f3727c80c4 (diff) | |
Merge "DO NOT MERGE: Multi-SIM - Fixing inconsistent naming in CarrierConfigManager." into mm-wireless-dev
am: d94fbf85d6 -s ours
* commit 'd94fbf85d6b9affc29fb312abd3548f3727c80c4':
DO NOT MERGE: Multi-SIM - Fixing inconsistent naming in CarrierConfigManager.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions