OSDN Git Service

am 68719a17: (-s ours) Reconcile with jb-mr1-release - do not merge
authorJean-Baptiste Queru <jbq@google.com>
Wed, 27 Feb 2013 06:26:28 +0000 (06:26 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 27 Feb 2013 06:26:28 +0000 (06:26 +0000)
* commit '68719a176eacf86d19813a38f59041f3b209693d':


Trivial merge