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


Trivial merge