summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorJoe LaPenna <jlapenna@google.com>2015-09-25 18:09:16 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-25 18:09:16 +0000
commit84270fb60ab29e9e0aa7975c9d300a758f0b16ef (patch)
tree7bccff27689b9aee289fb7e67a19c428157502bb /tools/aapt2/java/JavaClassGenerator.cpp
parent569af4e9f8927426bb3da2c6f2c13215c05592ea (diff)
parent5d05db28773dc0b242d8f894abd65f6b3c2a17c4 (diff)
am 5d05db28: (-s ours) am ac342d38: (-s ours) Merge "Disable debugging for device idle in wear branch DO NOT MERGE ANYWHERE" into cw-e-dev
* commit '5d05db28773dc0b242d8f894abd65f6b3c2a17c4': Disable debugging for device idle in wear branch DO NOT MERGE ANYWHERE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions