OSDN Git Service

am 47c0ea7d: (-s ours) Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 6 Sep 2012 16:10:21 +0000 (09:10 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 6 Sep 2012 16:10:21 +0000 (09:10 -0700)
* commit '47c0ea7dc81d55a105d71610ccf1db1b6d7e7831':


Trivial merge