tree 967f2714b7c695a2c8690d8099672ae2c639bbb8
parent a73c36ada8470ae319593ee9ad90a775f973a996
parent 5aecd4d24533c80e0c1e6e46759cbb698bf49386
author Tyler Gunn <tgunn@google.com> 1400024917 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400024917 +0000

am 5aecd4d2: (-s ours) am f8a5fb0d: am 7de0b82a: (-s ours) am 6fc9b3cc: am 6a47ffde: am bd8a362a: am 1f51f2bb: Correcting issue where text entered by user in searchbox is gray. DO NOT MERGE

* commit '5aecd4d24533c80e0c1e6e46759cbb698bf49386':