OSDN Git Service

am 53c01796: (-s ours) Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 30 May 2013 21:24:14 +0000 (14:24 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 30 May 2013 21:24:14 +0000 (14:24 -0700)
* commit '53c017961c78d7ed9e95ec081cf821db2ba91745':


Trivial merge