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

* commit 'f6f4abec09afda4d802ac0b7b2006d86a6161892':