summaryrefslogtreecommitdiffstats
path: root/keystore
diff options
context:
space:
mode:
authorOlawale Ogunwale <ogunwale@google.com>2015-04-24 18:35:29 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-24 18:35:29 +0000
commita298a96af77f0cb638b4e2be2ab762d0183ee813 (patch)
treef49d7b20027068b07dfdb934f7ad629c736da2c3 /keystore
parentff0bae7dbc24afb24bc712fd742ca1e6243e7966 (diff)
parent3846d3a4c5d79a9d7e86e43c64a5c21a29036de0 (diff)
downloadframeworks_base-a298a96af77f0cb638b4e2be2ab762d0183ee813.zip
frameworks_base-a298a96af77f0cb638b4e2be2ab762d0183ee813.tar.gz
frameworks_base-a298a96af77f0cb638b4e2be2ab762d0183ee813.tar.bz2
am 3846d3a4: am 6d856bfb: am cf7d2d95: Merge "[ActivityManager] Avoid orphan ContentProviderRecord."
* commit '3846d3a4c5d79a9d7e86e43c64a5c21a29036de0': [ActivityManager] Avoid orphan ContentProviderRecord.
Diffstat (limited to 'keystore')
0 files changed, 0 insertions, 0 deletions