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)
commita03f07f013265d3e5f8ee36184c613d9b5032c11
tree8e0dbe1ea2c67bc377199713d584b9aefd040af2
parente1b99ca8589f7f5bc0b019f7b50b8776a8f85bf0
parentd2e43dce632fdcdf56927635b6bbd48d90ec796d
am d2e43dce: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'd2e43dce632fdcdf56927635b6bbd48d90ec796d':