OSDN Git Service

am 7bf0939e: am 7298e5ab: am 2f3c1638: (-s ours) am 89d125ec: (-s ours) Reconcile...
authorJean-Baptiste Queru <jbq@google.com>
Mon, 11 Mar 2013 20:13:50 +0000 (13:13 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 11 Mar 2013 20:13:50 +0000 (13:13 -0700)
* commit '7bf0939e106c975ac897b5d701e116b6c86ab75a':


Trivial merge