OSDN Git Service

am 2f3c1638: (-s ours) am 89d125ec: (-s ours) Reconcile with jb-mr1-release - do...
authorJean-Baptiste Queru <jbq@google.com>
Mon, 11 Mar 2013 19:41:54 +0000 (12:41 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 11 Mar 2013 19:41:54 +0000 (12:41 -0700)
commit7298e5ab20b37767cab89e7bc5784eb99d46a749
tree5862b78d667371e87353d024d877a07edf11fa94
parent930540de4415795500e22f02bb707768b7742fc6
parent2f3c1638351db28f560acb819772a397d47d4192
am 2f3c1638: (-s ours) am 89d125ec: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '2f3c1638351db28f560acb819772a397d47d4192':