summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorShishir Agrawal <shishir@google.com>2014-12-10 23:36:24 +0000
committerandroid-build-merger <android-build-merger@google.com>2014-12-10 23:36:24 +0000
commit960dccebf576d53059fd7d026cdd1b81fb0b5974 (patch)
treef670ffabd7e67f6ee05ff8e6280dde5b1d2d2232 /tools/aapt2/java/JavaClassGenerator.cpp
parenta2530e4aa4c35787516ffea8368c0ebc35da4df4 (diff)
parent951dcdd9404054f6b7e794b18aad6f50e44732f9 (diff)
Merge "Adding a new hidden carrier API to mark GSM/CDMA networks as roaming/non-roaming." into lmp-mr1-dev
automerge: 951dcdd * commit '951dcdd9404054f6b7e794b18aad6f50e44732f9': 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