diff options
author | Kevin Hufnagle <khufnagle@google.com> | 2016-06-14 03:14:05 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-06-14 03:14:05 +0000 |
commit | de65e66efc9e4b09f289f42a44510c65497e00fa (patch) | |
tree | a135d289a1ebbd5d546198f39a0b726448bc1a4c /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 91173bc7e6bdd8f4c769fcbb5e73ceee62153646 (diff) | |
parent | 21eecc88d53c70968ec4003b54d722f0ede00d76 (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
am: 21eecc88d5
Change-Id: Id66550c43ff8c3a94ca992b51ea2e3af4258c555
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions