OSDN Git Service

am 9bc71158: am f9ad69f4: am 803b245e: (-s ours) am 469dbc0a: (-s ours) Reconcile...
authorJean-Baptiste Queru <jbq@google.com>
Mon, 11 Mar 2013 20:44:24 +0000 (13:44 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 11 Mar 2013 20:44:24 +0000 (13:44 -0700)
* commit '9bc711585e0711a57b4e043c0ecbc892ce1e17ee':


Trivial merge