am 58ac2762: am a03f07f0: (-s ours) am d2e43dce: (-s ours) Reconcile with jb-mr1...
authorJean-Baptiste Queru <jbq@google.com>
Mon, 11 Mar 2013 20:00:37 +0000 (13:00 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 11 Mar 2013 20:00:37 +0000 (13:00 -0700)
commit71dc25d1929a80c636008d0e491bfa282d69bec0
tree46a3808f486310fccae37feb63129e88fc92ba02
parent5552deebff413d7ef0e3bc308231406057554bd6
parent58ac276242d6fd28324bb9c0f09aff64765c4d8e
am 58ac2762: am a03f07f0: (-s ours) am d2e43dce: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '58ac276242d6fd28324bb9c0f09aff64765c4d8e':