OSDN Git Service

am 580904ea: (-s ours) Reconcile with jb-mr1-factory-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 12 Oct 2012 14:33:29 +0000 (07:33 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 12 Oct 2012 14:33:29 +0000 (07:33 -0700)
* commit '580904ea01f291b4b52dcea6da6345a2c3a16988':


Trivial merge