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

* commit '277dafd012b2499be0a775fce24f5e3f5b6a0efe':