OSDN Git Service

am 7bd5a76e: (-s ours) Reconcile with jb-mr1.1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 7 Dec 2012 15:56:46 +0000 (07:56 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 7 Dec 2012 15:56:46 +0000 (07:56 -0800)
* commit '7bd5a76e2e89ca6d172539ef2dfa43f42f07c001':


Trivial merge