summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorDavid Friedman <dmail@google.com>2015-08-27 10:40:22 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-27 10:40:22 +0000
commitdb8d1c53cbeeef55855b643f0ce4928bc362f07c (patch)
tree715d547d2502de8d04de0ec12233b3183ce62c99 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent8d61bcd897f7eb581f39ff9a2a1c2683a43312dd (diff)
parentafee154dd7dd90088e89d444301108cca0854bc6 (diff)
am afee154d: (-s ours) am 6540375a: am 311f8eee: am ed54f60a: Merge "Docs: Updating, clarifying Debug-over-WiFi instructions. Bug: 21371836" into mnc-preview-docs
* commit 'afee154dd7dd90088e89d444301108cca0854bc6':
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions