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)
commitaad485da258d94d32f2fa1e1a80d00ca3e2170be
tree8c30265af3703a90c055ac1e647123613fb56fe6
parentc8a9913afea1419253f6948450275a48fffb5aee
parent9e30117d8a94bddafe135bd9f50af8b3ac7d2e99
am 9e30117d: Merge from AOSP

* commit '9e30117d8a94bddafe135bd9f50af8b3ac7d2e99':
  Remove unnecessary dependency on keystore_client