OSDN Git Service

am 58d6b9eb: (-s ours) am 10f06dc0: am 0b904fda: am 93bb0058: am 4bcc1fdb: (-s ours...
authorJean-Baptiste Queru <jbq@google.com>
Mon, 11 Mar 2013 20:56:10 +0000 (20:56 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 11 Mar 2013 20:56:10 +0000 (20:56 +0000)
commitcb8daa8c44fddb180bdc2c6d0b42956696317269
treebd1c9891381f95cab44fe9798496349539acc851
parent9641bd36dbf0c4b1eeb84499b35c1cdb7fa5a530
parent58d6b9eb20a9805ea7cecff1df01259e8a2ce1d4
am 58d6b9eb: (-s ours) am 10f06dc0: am 0b904fda: am 93bb0058: am 4bcc1fdb: (-s ours) am b25a2fcf: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '58d6b9eb20a9805ea7cecff1df01259e8a2ce1d4':