OSDN Git Service

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


Trivial merge