am da8940f4: am 71dc25d1: am 58ac2762: am a03f07f0: (-s ours) am d2e43dce: (-s ours...
authorJean-Baptiste Queru <jbq@google.com>
Mon, 11 Mar 2013 20:44:27 +0000 (13:44 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 11 Mar 2013 20:44:27 +0000 (13:44 -0700)
commited9dc1f8074491341696bf7d9192b87784963b4a
tree9ad0214d1a484baa548494a080217ca9738feedf
parentd09ee48e1cd72e2b14cdba926a409fec3c9fbe43
parentda8940f4e81a3f56ace5699b89cc4e09779904ef
am da8940f4: am 71dc25d1: am 58ac2762: am a03f07f0: (-s ours) am d2e43dce: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'da8940f4e81a3f56ace5699b89cc4e09779904ef':