tree b55a9d4d0fd883c92bdc40c990453d95c46bc73a
parent 34550c30f1fb537745331deed8f7364033969f96
parent 0363c43b4701b87ddd925c387b9f002257f91212
author Jin Cao <jinyan@google.com> 1414955745 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414955745 +0000

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

* commit '0363c43b4701b87ddd925c387b9f002257f91212':
  tablet search icon bug fixes and simplification