tree ecf6c8f4a7657ca13bc0462373e2e7600b48d2fe
parent 66106e0c945fade2b41dcfd2b0746477b87ecf09
parent 7de0b82a6326024cb44fb4c54a6f990c6fee4654
author Tyler Gunn <tgunn@google.com> 1394654200 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394654200 +0000

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 '7de0b82a6326024cb44fb4c54a6f990c6fee4654':
  Correcting issue where text entered by user in searchbox is gray. DO NOT MERGE