summaryrefslogtreecommitdiff
path: root/keystore/java/android/security/AndroidKeyStore.java
diff options
context:
space:
mode:
authorJinsuk Kim <jinsukkim@google.com>2015-05-12 21:34:29 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-05-12 21:34:31 +0000
commit6dda58e7acb13f8a9c3fab385055eedf7d5c9416 (patch)
tree1a394332bad96b37c973c2bd6cd792073c4d7290 /keystore/java/android/security/AndroidKeyStore.java
parent20e16f4f762ddaf8a3574ad03c3f3a9f97a44637 (diff)
parente6e8f3d589f42393cf02a2bd766d678d80dad874 (diff)
Merge "CEC: Let playback device send <Standby> upon power off" into mnc-dev
Diffstat (limited to 'keystore/java/android/security/AndroidKeyStore.java')
0 files changed, 0 insertions, 0 deletions