summaryrefslogtreecommitdiffstats
path: root/keystore
diff options
context:
space:
mode:
authorBenjamin Franz <bfranz@google.com>2015-06-18 06:27:36 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-18 06:27:39 +0000
commit9cb6a493f4e8bd9914f2841355b3293f90773802 (patch)
tree83cb9f28f875fb11a3a4a4a964e43d9c60cae3af /keystore
parent3d54e672a58301ff60498fc7c57870d9bccd0e45 (diff)
parent1046ba518b07e42eb5d3474f1ff9ca1181c331d5 (diff)
downloadframeworks_base-9cb6a493f4e8bd9914f2841355b3293f90773802.zip
frameworks_base-9cb6a493f4e8bd9914f2841355b3293f90773802.tar.gz
frameworks_base-9cb6a493f4e8bd9914f2841355b3293f90773802.tar.bz2
Merge "Add DISALLOW_CREATE_WINDOWS to Device Owner only user restrictions" into mnc-dev
Diffstat (limited to 'keystore')
0 files changed, 0 insertions, 0 deletions