OSDN Git Service

am c2203765: (-s ours) Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 12 Sep 2012 23:59:15 +0000 (16:59 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 12 Sep 2012 23:59:15 +0000 (16:59 -0700)
* commit 'c2203765ea773939cc1a3fe3a77d887c91d0719b':


Trivial merge