tree 273b4b3aa02796bc8bdd73e40e26d81c25fa5e25
parent 8d5bd9f385e5c89a32e58c994c28c22e711749a4
parent b0aa32136d714aa57be2e453714b3691e7ba7d9f
author Ian Parkinson <ianp@google.com> 1422669704 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422669704 +0000

am b0aa3213: am e4ad5070: am 25ad9e4e: Merge "Give GEL a way to clear the typed text when it starts searching" into ub-now-porkchop

* commit 'b0aa32136d714aa57be2e453714b3691e7ba7d9f':