summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorNick Kralevich <nnk@google.com>2015-08-04 21:18:45 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-04 21:18:45 +0000
commit8ad7c8f9553611798fa39ff20cea3313c5b64922 (patch)
treef6d1e1cd33dd2e89c60f338cb19ce13bd9c0193f /tools/aapt2/java/JavaClassGenerator_test.cpp
parentd56554e82b591357cbb819859ddcc7b87ff7306b (diff)
parent94933e43dc9793f1bb788bee06000f8fbd8ed959 (diff)
am 94933e43: am 2eafb06f: am b2c71814: am 97b68bbe: Merge "UsbDeviceManager: fix b/21429947 regression (try #2)" into mnc-dev
* commit '94933e43dc9793f1bb788bee06000f8fbd8ed959': UsbDeviceManager: fix b/21429947 regression (try #2)
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions