tree 408bdec54f939cf5125cac410594f0271e6625c7
parent ecf11ceb6015b715b711475a46d819a73bb62d3c
parent 284e1954274b708f3cf60ab82cdabe0f4c31d141
author Jeff Brown <jeffbrown@google.com> 1285955398 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285955398 -0700

am 284e1954: resolved conflicts for merge of 4110368b to gingerbread-plus-aosp

Merge commit '284e1954274b708f3cf60ab82cdabe0f4c31d141'

* commit '284e1954274b708f3cf60ab82cdabe0f4c31d141':