OSDN Git Service

am f6f4abec: (-s ours) Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 28 May 2013 20:50:18 +0000 (13:50 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 28 May 2013 20:50:18 +0000 (13:50 -0700)
* commit 'f6f4abec09afda4d802ac0b7b2006d86a6161892':


Trivial merge