diff options
author | Philipp Weiß <phweiss@google.com> | 2017-05-10 16:08:04 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-05-10 16:08:04 +0000 |
commit | d36debb29d5e57606052a33712acddc481565a0e (patch) | |
tree | 421ec71ffc685184c346e21875d94546769e0174 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | c8097441e2a933183669a86707a25581b42b83a4 (diff) | |
parent | 47d13239c08648dce6b07b2c0034da429bed5779 (diff) |
Merge "Implement CACert queries in SecurityController" into oc-dev am: 4c78ac9ce4
am: 47d13239c0 -s ours
Change-Id: I764b6a343522c6eceadc79182546e55d6eee9e45
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions