summaryrefslogtreecommitdiff
path: root/keystore/java/android/security/KeyChain.java
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2015-02-05 03:50:28 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-02-05 03:50:28 +0000
commit323d888b64eec7dcbfe1b9b0831df872ba463de3 (patch)
tree9a397bd4fef22357082a51fd64fa97b7e5c0447e /keystore/java/android/security/KeyChain.java
parentd7c32e484364015e3965c6c090e1c223e14b3e2f (diff)
parenteeb69d171b4023e92fb729bf61d566540bdd5220 (diff)
am eeb69d17: Move layer-list to be top-level element in seek bar progress automerge: bac8e12 automerge: 6708ac4
* commit 'eeb69d171b4023e92fb729bf61d566540bdd5220': Move layer-list to be top-level element in seek bar progress
Diffstat (limited to 'keystore/java/android/security/KeyChain.java')
0 files changed, 0 insertions, 0 deletions