OSDN Git Service

am d7545049: Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 8 Nov 2012 16:58:02 +0000 (08:58 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 8 Nov 2012 16:58:02 +0000 (08:58 -0800)
* commit 'd7545049bfe7142389eae84394d6b76ed9b68fb2':


Trivial merge