am 71dc25d1: am 58ac2762: am a03f07f0: (-s ours) am d2e43dce: (-s ours) Reconcile...
authorJean-Baptiste Queru <jbq@google.com>
Mon, 11 Mar 2013 20:13:32 +0000 (13:13 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 11 Mar 2013 20:13:32 +0000 (13:13 -0700)
commitda8940f4e81a3f56ace5699b89cc4e09779904ef
tree17ab01a40ebc171ce583c83103ec0da30601a97f
parentd6b94e50e937003c60bbdf832a0d16337de14b09
parent71dc25d1929a80c636008d0e491bfa282d69bec0
am 71dc25d1: am 58ac2762: am a03f07f0: (-s ours) am d2e43dce: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '71dc25d1929a80c636008d0e491bfa282d69bec0':