tree 69654c790917913b464ed59c26070655abe5a20f
parent e402f1fde2deca0b1120e6d582ab9dce59879ae1
parent 6d93da465ab8fff02728f268785e59ab86a2a0c2
author The Android Open Source Project <initial-contribution@android.com> 1354211374 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1354211374 -0800

am 6d93da46: (-s ours) Reconcile with jb-mr1.1-release - do not merge

* commit '6d93da465ab8fff02728f268785e59ab86a2a0c2':