summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorRobin Lee <rgl@google.com>2014-10-22 05:54:39 +0000
committerandroid-build-merger <android-build-merger@google.com>2014-10-22 05:54:39 +0000
commitaf3668c31bfe0c1271f5f64f9ee39c48f06a1919 (patch)
tree1ee4415c5079a3a386217ab972629aae4e474647 /packages
parent98feebe51147f40307ee93440a3ade04bb2ee8de (diff)
parentafa5ae5f8db8575a21e796e5a35cf3c9f44baa3f (diff)
downloadframeworks_base-af3668c31bfe0c1271f5f64f9ee39c48f06a1919.zip
frameworks_base-af3668c31bfe0c1271f5f64f9ee39c48f06a1919.tar.gz
frameworks_base-af3668c31bfe0c1271f5f64f9ee39c48f06a1919.tar.bz2
am de7df08c: am fc567900: am e1c9489c: Merge "DevicePolicy: Restore CA warning to K behaviour" into lmp-dev automerge: bd4f2a4
automerge: afa5ae5 * commit 'afa5ae5f8db8575a21e796e5a35cf3c9f44baa3f': DevicePolicy: Restore CA warning to K behaviour
Diffstat (limited to 'packages')
0 files changed, 0 insertions, 0 deletions