OSDN Git Service

am f8fbfd9f: Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 12 Nov 2012 15:28:32 +0000 (07:28 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 Nov 2012 15:28:32 +0000 (07:28 -0800)
* commit 'f8fbfd9fcfc311c66c37d3e63e1feb01726e0b4f':


Trivial merge