OSDN Git Service

am 63c34b5e: am 68719a17: (-s ours) Reconcile with jb-mr1-release - do not merge
authorJean-Baptiste Queru <jbq@google.com>
Fri, 14 Jun 2013 01:07:45 +0000 (18:07 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 14 Jun 2013 01:07:45 +0000 (18:07 -0700)
* commit '63c34b5e2aae446b76fdf34f0ff895e35cd7376a':


Trivial merge