summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorStuart Scott <stuartscott@google.com>2015-01-29 02:06:51 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-01-29 02:06:51 +0000
commitcf8ae79ef28b8e25ab67638ee1c86abe6bf06c6b (patch)
tree8d38f23fe41e17b7f7d41aca20de38ed966ff485 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent1cbe026b932fa7820ab1ab27833a4a1bf1ff3ebf (diff)
parent8d702000a7291068e639a9954e03c36d66144449 (diff)
am 8d702000: Merge "Change getDeviceId to take phoneId." into lmp-mr1-dev automerge: f4e5236
* commit '8d702000a7291068e639a9954e03c36d66144449': Change getDeviceId to take phoneId.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions