summaryrefslogtreecommitdiffstats
path: root/keystore
diff options
context:
space:
mode:
authorGeorge Mount <mount@google.com>2014-10-16 14:35:30 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-16 14:35:30 +0000
commite084c1f1e56444acc84db6e90a2136f6712cc6f8 (patch)
tree84c5d79dc8028d0a013cccf1f92910b2f6a78ea2 /keystore
parentb4b7f64921a7d6933e553a2f57173d76ff5673ee (diff)
parent56789daadf666a24c4644cd3820561566582109f (diff)
downloadframeworks_base-e084c1f1e56444acc84db6e90a2136f6712cc6f8.zip
frameworks_base-e084c1f1e56444acc84db6e90a2136f6712cc6f8.tar.gz
frameworks_base-e084c1f1e56444acc84db6e90a2136f6712cc6f8.tar.bz2
am 56789daa: am 27a08f2a: am ea6f0ae8: Merge "Use empty snapshots list when there are no shared elements." into lmp-mr1-dev
* commit '56789daadf666a24c4644cd3820561566582109f': Use empty snapshots list when there are no shared elements.
Diffstat (limited to 'keystore')
0 files changed, 0 insertions, 0 deletions