am 9e30117d: Merge from AOSP
authorJean-Baptiste Queru <jbq@google.com>
Wed, 28 Nov 2012 18:49:05 +0000 (10:49 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 28 Nov 2012 18:49:05 +0000 (10:49 -0800)
* commit '9e30117d8a94bddafe135bd9f50af8b3ac7d2e99':
  Remove unnecessary dependency on keystore_client


Trivial merge