summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2016-06-14 03:09:46 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-06-14 03:09:47 +0000
commit21eecc88d53c70968ec4003b54d722f0ede00d76 (patch)
treea57b6f1ff30d6841d6c6e4903a0eacece5fc167b /tools/aapt2/java/JavaClassGenerator_test.cpp
parent6fd3459843e4fc747594a1952aece26e89250ee5 (diff)
parent0df4a27339ef4cf0d1788ae0701eb158d29ec95e (diff)
Merge "Merge \\"docs: Expanded description of \\"Key Attestation\\" N Preview feature.\\" into nyc-dev am: f6250cc7df am: 697b44a552" into nyc-mr1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions