diff options
| author | Robin Lee <rgl@google.com> | 2014-12-28 05:36:20 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-12-28 05:36:20 +0000 |
| commit | b6b7d4251cdab1843ae9b2ae167ac9276ada241e (patch) | |
| tree | b598caa7c900309acdf692d6e4aa450426fc12e9 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 4ac5f68b563b432a0728e430c42dafec4045631d (diff) | |
| parent | c9db16c59164d865b92e4527fb479fb892c5d4bb (diff) | |
am b4b14e39: Merge "Revert "DevicePolicy: Don\'t warn about managed profile CAs"" into lmp-mr1-dev
automerge: c9db16c
* commit 'c9db16c59164d865b92e4527fb479fb892c5d4bb':
Revert "DevicePolicy: Don't warn about managed profile CAs"
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions