tree cb0d28d31fd5eb1f96c5eaf44ac301003cc93327
parent 136de4ead0c1c0bcdcf1f7904188d1410ebc1e42
parent 4ddfaeb5fe29d5dd3dbfd525e97723a972ea5a65
author Tony Chan <htchan@google.com> 1333185315 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1333185315 -0700

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

* commit '4ddfaeb5fe29d5dd3dbfd525e97723a972ea5a65':
  sdk doc change: Added KeyChain API Demo