Merge "Revert "Add search bar to SearchActivity."" into oc-dev am: 37f87b6c64

am: 93adcee630  -s ours

Change-Id: I6871d37124fb138b50d486764f32af9b14bb5521
This commit is contained in:
Andrew Sapperstein
2017-06-06 19:11:03 +00:00
committed by android-build-merger

Diff Content Not Available