tree 57e49da0b90565c76a1394b8a875fc22e9ae0369
parent 1e5b35d7974a22ab0168cc68281d55ea58eb783c
parent 74f9eae893f208979de29ac04e58e403386775f5
author Mindy Pereira <mindyp@google.com> 1365535919 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1365535919 -0700

am 74f9eae8: am 2797dbd5: am 3a36cf75: Merge "Dont hide the keyboard when showing alternates/ selecting a chip." into jb-dev

* commit '74f9eae893f208979de29ac04e58e403386775f5':