diff options
| author | Robin Lee <rgl@google.com> | 2014-12-28 05:51:19 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-12-28 05:51:19 +0000 |
| commit | 77f9a44adb07640762873ef0f80d32570771f154 (patch) | |
| tree | e02bd177328f09212c865fbcae71107dbbb52822 /telephony | |
| parent | a0877a99ec106ea8887c766029c6e3f4e04bde01 (diff) | |
| parent | b6b7d4251cdab1843ae9b2ae167ac9276ada241e (diff) | |
| download | frameworks_base-77f9a44adb07640762873ef0f80d32570771f154.zip frameworks_base-77f9a44adb07640762873ef0f80d32570771f154.tar.gz frameworks_base-77f9a44adb07640762873ef0f80d32570771f154.tar.bz2 | |
am b4b14e39: Merge "Revert "DevicePolicy: Don\'t warn about managed profile CAs"" into lmp-mr1-dev automerge: c9db16c
automerge: b6b7d42
* commit 'b6b7d4251cdab1843ae9b2ae167ac9276ada241e':
Revert "DevicePolicy: Don't warn about managed profile CAs"
Diffstat (limited to 'telephony')
0 files changed, 0 insertions, 0 deletions