tree ad9e8e176f935ac237e6f89052375e3ba5ca6a45
parent 690a56e396d98fde4b97e56ec0aa4a091d076f4a
parent 2c8ac8c9f26b96055d1438c634f4ca95f2e92663
author Jin Cao <jinyan@google.com> 1414960393 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414960393 +0000

am 2c8ac8c9: am 7eb084dd: am c36bfb3e: am 0363c43b: am 4c9cd718: Merge "tablet search icon bug fixes and simplification" into ub-gmail-ur14-dev

* commit '2c8ac8c9f26b96055d1438c634f4ca95f2e92663':
  tablet search icon bug fixes and simplification