OSDN Git Service

am b9f5c914: (-s ours) am b263fd97: am 3253b263: Reconcile with jb-mr1-release -...
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 12 Nov 2012 15:34:12 +0000 (07:34 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 Nov 2012 15:34:12 +0000 (07:34 -0800)
* commit 'b9f5c914a818d91c8eebc51d35672ca6ee2763db':


Trivial merge