diff options
| author | Robin Lee <rgl@google.com> | 2014-12-23 13:29:05 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-23 13:29:05 +0000 |
| commit | c9db16c59164d865b92e4527fb479fb892c5d4bb (patch) | |
| tree | c5ec6991f0a3ec947e3062029dd918499971d7b4 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | cecabf48ae85943b9c0e5b4805299794f5f3b857 (diff) | |
| parent | b4b14e391dbcde537350ccf649b3603cafba1e6c (diff) | |
am b4b14e39: Merge "Revert "DevicePolicy: Don\'t warn about managed profile CAs"" into lmp-mr1-dev
* commit 'b4b14e391dbcde537350ccf649b3603cafba1e6c':
Revert "DevicePolicy: Don't warn about managed profile CAs"
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions