OSDN Git Service

am 7298e5ab: am 2f3c1638: (-s ours) am 89d125ec: (-s ours) Reconcile with jb-mr1...
authorJean-Baptiste Queru <jbq@google.com>
Mon, 11 Mar 2013 20:00:55 +0000 (13:00 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 11 Mar 2013 20:00:55 +0000 (13:00 -0700)
commit7bf0939e106c975ac897b5d701e116b6c86ab75a
treeaef74de8d140339b954cecdac3d4c81ef2a5c433
parent0cc49e8db007f71888bf706420edfc530cf4fbff
parent7298e5ab20b37767cab89e7bc5784eb99d46a749
am 7298e5ab: am 2f3c1638: (-s ours) am 89d125ec: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '7298e5ab20b37767cab89e7bc5784eb99d46a749':