OSDN Git Service

am 53694360: (-s ours) Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 2 Oct 2012 16:21:11 +0000 (09:21 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 2 Oct 2012 16:21:11 +0000 (09:21 -0700)
* commit '53694360600f087c1cb8e78e39451886b5cb07bf':


Trivial merge