OSDN Git Service

am 72c7cf9d: am a1b1e2de: (-s ours) am 56f387a4: (-s ours) Reconcile with jb-mr1...
authorJean-Baptiste Queru <jbq@google.com>
Mon, 11 Mar 2013 20:00:27 +0000 (13:00 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 11 Mar 2013 20:00:27 +0000 (13:00 -0700)
commit15a315776514955bfd04d5cd53a10171583d622f
treee9bdb0a8eef7eff82045b95e8cfcb26d3807ef6b
parent64143ff27c2ffd8bd91ee9451305704e6b54ac6e
parent0a6fba48af31916208a20b2bf142ac7dea0a014a
am 72c7cf9d: am a1b1e2de: (-s ours) am 56f387a4: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '72c7cf9d13f5a51a71dccc6d94317727bd0feec3':