OSDN Git Service

am e37fa977: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do...
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 10 Oct 2012 16:51:07 +0000 (09:51 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 10 Oct 2012 16:51:07 +0000 (09:51 -0700)
* commit 'e37fa97752cb0e8b79b94f1c1745894b40b7d57e':


Trivial merge