summaryrefslogtreecommitdiffstats
path: root/keystore
diff options
context:
space:
mode:
authorMakoto Onuki <omakoto@google.com>2015-07-16 21:01:37 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-07-16 21:01:39 +0000
commitb09b84cafde5ac31f5ef5c79f7a78db540824471 (patch)
treef4fc121376f1af84117efea3e3e7facb4122e17a /keystore
parentdb8fa48ed0864125a07f2bbe078fd60abd875ac7 (diff)
parentbc92479a297904856f0815bc14bcb6763bbbf8bf (diff)
downloadframeworks_base-b09b84cafde5ac31f5ef5c79f7a78db540824471.zip
frameworks_base-b09b84cafde5ac31f5ef5c79f7a78db540824471.tar.gz
frameworks_base-b09b84cafde5ac31f5ef5c79f7a78db540824471.tar.bz2
Merge "DefaultPermission: GET_ACCOUNTS is now in CONTACTS" into mnc-dev
Diffstat (limited to 'keystore')
0 files changed, 0 insertions, 0 deletions