tree 399c625783d63c4d4aeb13b1cdcca9283e28ce01
parent 1a62c04d7f0fab3a66791ea9a75fcf5945572629
parent 5c015d2b8bef04a91463470563ec28eb20892064
author Yorke Lee <yorkelee@google.com> 1398964534 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1398964534 +0000

am 5c015d2b: Merge "Use EditText for search in ActionBar"

* commit '5c015d2b8bef04a91463470563ec28eb20892064':
  Use EditText for search in ActionBar