OSDN Git Service

am 8280f934: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do...
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 15 Oct 2012 14:43:17 +0000 (07:43 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 15 Oct 2012 14:43:17 +0000 (07:43 -0700)
* commit '8280f93403bfd5d5e24ebfb969f22e2e5d36f85e':


Trivial merge