OSDN Git Service

am ebabdd4d: am f8217304: More work on the Crypt Keeper.
authorJason parks <jparks@google.com>
Thu, 27 Jan 2011 17:33:17 +0000 (09:33 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Jan 2011 17:33:17 +0000 (09:33 -0800)
* commit 'ebabdd4d2491048d1c73b1858931cb4640a0d564':
  More work on the Crypt Keeper.


Trivial merge