am d2e43dce: (-s ours) Reconcile with jb-mr1-release - do not merge
authorJean-Baptiste Queru <jbq@google.com>
Mon, 11 Mar 2013 19:27:40 +0000 (12:27 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 11 Mar 2013 19:27:40 +0000 (12:27 -0700)
* commit 'd2e43dce632fdcdf56927635b6bbd48d90ec796d':


Trivial merge