OSDN Git Service

am c5604b08: am 0fe40641: am 72c7cf9d: am a1b1e2de: (-s ours) am 56f387a4: (-s ours...
authorJean-Baptiste Queru <jbq@google.com>
Mon, 11 Mar 2013 20:44:22 +0000 (13:44 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 11 Mar 2013 20:44:22 +0000 (13:44 -0700)
commitb4d92c5b79be5557318e3636a31e9ff8249bec8e
treec1b635a2b80aff583bf569f53942239727369038
parent70369845f8250df4f6f22c336414b4df0a3ce53e
parentc5604b081b6cac558ed94dce88dedf1a467185b7
am c5604b08: am 0fe40641: am 72c7cf9d: am a1b1e2de: (-s ours) am 56f387a4: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'c5604b081b6cac558ed94dce88dedf1a467185b7':