summaryrefslogtreecommitdiffstats
path: root/keystore/java
diff options
context:
space:
mode:
authorKatie McCormick <kmccormick@google.com>2013-01-03 16:16:47 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-01-03 16:16:47 -0800
commitf420b800b8813aee636f955012da6fb87e631827 (patch)
tree545e11ae0c54b04b1e2a9b42f824268e4c457a65 /keystore/java
parentcd7b6a947060dfa3da58acbba039274103077757 (diff)
parent47f56dbf692939ba30a347844d6688e120a666ea (diff)
downloadframeworks_base-f420b800b8813aee636f955012da6fb87e631827.zip
frameworks_base-f420b800b8813aee636f955012da6fb87e631827.tar.gz
frameworks_base-f420b800b8813aee636f955012da6fb87e631827.tar.bz2
am 47f56dbf: am d56e4eca: am ed2a05bc: Merge "Doc change: minor fixes to support lib lesson." into jb-mr1-dev
* commit '47f56dbf692939ba30a347844d6688e120a666ea': Doc change: minor fixes to support lib lesson.
Diffstat (limited to 'keystore/java')
0 files changed, 0 insertions, 0 deletions