tree 29be81ec30806501a304e2b4d71c2bede90616f2
parent b821a1f98082dbea1e4303ed6b079168b9ae5153
parent 2963ae34fe760211028c7a0d74e81a3dd5801f98
author Tony Chan <htchan@google.com> 1333185482 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1333185482 -0700

am 2963ae34: am 4ddfaeb5: Merge "sdk doc change: Added KeyChain API Demo" into ics-mr1

* commit '2963ae34fe760211028c7a0d74e81a3dd5801f98':
  sdk doc change: Added KeyChain API Demo