summaryrefslogtreecommitdiffstats
path: root/keystore
diff options
context:
space:
mode:
authorEtan Cohen <etancohen@google.com>2015-07-08 19:02:31 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-07-08 19:02:34 +0000
commit3aa1b1e5ec3a4e2074ea054b931cd68df45b43cf (patch)
tree3bbbbb9ba44c46cb3cf31c70ad3cce6184956ab9 /keystore
parenta8c247e0b4e14123f85cec00500144ff28aaf6ed (diff)
parent47051d8e6dfcede55fa926c38bc06a6314fe6e4f (diff)
downloadframeworks_base-3aa1b1e5ec3a4e2074ea054b931cd68df45b43cf.zip
frameworks_base-3aa1b1e5ec3a4e2074ea054b931cd68df45b43cf.tar.gz
frameworks_base-3aa1b1e5ec3a4e2074ea054b931cd68df45b43cf.tar.bz2
Merge "Lock screen text: consider possible WFC service in APM" into mnc-dev
Diffstat (limited to 'keystore')
0 files changed, 0 insertions, 0 deletions