[automerger skipped] Merge "Remove search option in Magnification settings" into pi-dev am: f9b93310c5

am: ecd3b2da54  -s ours

Change-Id: I99a647a6f5b29093ce64be9c19622a3bde10a359
This commit is contained in:
Fan Zhang
2018-05-10 18:02:38 -07:00
committed by android-build-merger

Diff Content Not Available