am eb69ddd4: am c2e35f33: (-s ours) am 932e8e5d: (-s ours) Reconcile with jb-mr1...
authorJean-Baptiste Queru <jbq@google.com>
Mon, 11 Mar 2013 19:32:01 +0000 (12:32 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 11 Mar 2013 19:32:01 +0000 (12:32 -0700)
commit9b5a5a0f9dac0b5d7d540e1669bbccc74c1a37d2
tree757dc2af69c8a2fabf997cb654384c102a22135d
parentc93d3b14259cd00a9d7f92e3e2dd4d9992fca94e
parenteb69ddd4db1f1a421f1d27e1d42d557f0897f08e
am eb69ddd4: am c2e35f33: (-s ours) am 932e8e5d: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'eb69ddd4db1f1a421f1d27e1d42d557f0897f08e':