summaryrefslogtreecommitdiff
path: root/keystore/java/android/security/KeyChain.java
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2015-02-05 03:45:31 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-02-05 03:45:31 +0000
commiteeb69d171b4023e92fb729bf61d566540bdd5220 (patch)
tree1510659fd020058cb707caecf26bb20822f0475a /keystore/java/android/security/KeyChain.java
parent1350671f406c238439e1dc4378287bd422aaf636 (diff)
parent6708ac40f29c2437d3cb67ffa7604aecbdad1fe7 (diff)
Move layer-list to be top-level element in seek bar progress automerge: bac8e12
automerge: 6708ac4 * commit '6708ac40f29c2437d3cb67ffa7604aecbdad1fe7': 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