diff options
| author | Shishir Agrawal <shishir@google.com> | 2014-12-11 01:39:54 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-11 01:39:54 +0000 |
| commit | f864e449010d18edd9a8e4594d8df27003f38fc5 (patch) | |
| tree | 9387e32d2c8392cb717d4387f8c8ccd92dafb31c /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | ac3c4e0c6c71bfac5ce121c23708eb197db50de9 (diff) | |
| parent | 23172c706b0422ec2cc5bb9e1988a3bd2944a257 (diff) | |
am 23172c70: am 960dcceb: Merge "Adding a new hidden carrier API to mark GSM/CDMA networks as roaming/non-roaming." into lmp-mr1-dev automerge: 951dcdd
* commit '23172c706b0422ec2cc5bb9e1988a3bd2944a257':
Adding a new hidden carrier API to mark GSM/CDMA networks as roaming/non-roaming.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions