am 7915b22e: am a4b20d71: am b8e1033c: (-s ours) am e5412a9a: (-s ours) Reconcile...
authorJean-Baptiste Queru <jbq@google.com>
Mon, 11 Mar 2013 19:30:58 +0000 (12:30 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 11 Mar 2013 19:30:58 +0000 (12:30 -0700)
commitb2525ba8a0f91594df17e893d036c416a109b012
treecbc529f02d2cb95028efab2a350eb51ae673ea99
parent6d6f5e618e054e79d80a02f2c3f76ce0fd73bb2a
parent7915b22e8f70b80a9fc2c41f9734194c58b546fc
am 7915b22e: am a4b20d71: am b8e1033c: (-s ours) am e5412a9a: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '7915b22e8f70b80a9fc2c41f9734194c58b546fc':