summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorSanket Padawe <sanketpadawe@google.com>2015-01-20 22:58:29 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-01-20 22:58:29 +0000
commit76e9d18055d131bede49886c9c86c9f59db3fac4 (patch)
tree8dcd7ee2ecbeb1e31ee3e5accce370dc7cec7bfa /tools/aapt2/java/JavaClassGenerator_test.cpp
parent375ae7ba3263ee8eceeb371b170e9181c801c612 (diff)
parente54e760477b95aa0396c3abb2b7452410782b147 (diff)
Merge "Fixed a crash in TelephonyManager while calling getDeviceID()" into lmp-mr1-dev
automerge: e54e760 * commit 'e54e760477b95aa0396c3abb2b7452410782b147': Fixed a crash in TelephonyManager while calling getDeviceID()
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions