summaryrefslogtreecommitdiffstats
path: root/keystore
diff options
context:
space:
mode:
authorAndrew Solovay <asolovay@google.com>2015-04-30 03:14:13 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-30 03:14:13 +0000
commit4fbdbbe8f1bbf743ea730774173667835749787e (patch)
tree6d5b464e4e7248128f181fa4e222d2a958ff047c /keystore
parentf0abe000eb491f8b990d99d3159dc949f3c8e0e3 (diff)
parentc15736b95d61033f03b1446371315bfa46252aaf (diff)
downloadframeworks_base-4fbdbbe8f1bbf743ea730774173667835749787e.zip
frameworks_base-4fbdbbe8f1bbf743ea730774173667835749787e.tar.gz
frameworks_base-4fbdbbe8f1bbf743ea730774173667835749787e.tar.bz2
am c15736b9: am c2e2c7d5: Merge "docs: Minor formatting cleanup." into lmp-mr1-ub-docs
* commit 'c15736b95d61033f03b1446371315bfa46252aaf': docs: Minor formatting cleanup.
Diffstat (limited to 'keystore')
0 files changed, 0 insertions, 0 deletions