OSDN Git Service

am 89d125ec: (-s ours) Reconcile with jb-mr1-release - do not merge
authorJean-Baptiste Queru <jbq@google.com>
Mon, 11 Mar 2013 19:23:10 +0000 (12:23 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 11 Mar 2013 19:23:10 +0000 (12:23 -0700)
* commit '89d125ecbdbbeba975bd8c5cf5055558ddf35a4a':


Trivial merge