summaryrefslogtreecommitdiffstats
path: root/core/jni/android
diff options
context:
space:
mode:
authorRobin Lee <rgl@google.com>2014-10-21 11:58:38 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-21 11:58:38 +0000
commitfc56790085463ab410a5f407a4930b42509ad5f7 (patch)
tree58ce3732d71419aa8f22d4867ebd73bb4654b36a /core/jni/android
parentdeddb38462389823c194559052c4d64ee6c3b467 (diff)
parente1c9489cc40542bfa2adbb84b6fb77cff4ab8570 (diff)
downloadframeworks_base-fc56790085463ab410a5f407a4930b42509ad5f7.zip
frameworks_base-fc56790085463ab410a5f407a4930b42509ad5f7.tar.gz
frameworks_base-fc56790085463ab410a5f407a4930b42509ad5f7.tar.bz2
am e1c9489c: Merge "DevicePolicy: Restore CA warning to K behaviour" into lmp-dev
* commit 'e1c9489cc40542bfa2adbb84b6fb77cff4ab8570': DevicePolicy: Restore CA warning to K behaviour
Diffstat (limited to 'core/jni/android')
0 files changed, 0 insertions, 0 deletions