am 9b5a5a0f: am eb69ddd4: am c2e35f33: (-s ours) am 932e8e5d: (-s ours) Reconcile...
authorJean-Baptiste Queru <jbq@google.com>
Mon, 11 Mar 2013 19:34:30 +0000 (12:34 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 11 Mar 2013 19:34:30 +0000 (12:34 -0700)
commitb9de449616f5f0ab8eb6e819bb581f9c353316f9
treea23752aa3b8756c88bdde11458d76f9f04164133
parent958e731633ccc639f78b9842abd833794173ce6d
parent9b5a5a0f9dac0b5d7d540e1669bbccc74c1a37d2
am 9b5a5a0f: am eb69ddd4: am c2e35f33: (-s ours) am 932e8e5d: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '9b5a5a0f9dac0b5d7d540e1669bbccc74c1a37d2':