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)
commita5b9923fc5ff4d08d03a6d9161158a6aa0b80542
treec2d7c6b12bf5299f33a0aa588f7a624e27b2eb30
parentab8d600d9ca0b8fef3d093b7ffa358766decda8f
parentf6f4abec09afda4d802ac0b7b2006d86a6161892
am f6f4abec: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit 'f6f4abec09afda4d802ac0b7b2006d86a6161892':