tree 381d12d0b6f52b340c03fef995186195c9a54972
parent bfeee279a86c65b9aeb9aa6b4dd0a20a66f33c23
parent ecd3b2da54367c08248bf2fc63bdf537ee3d662e
author Fan Zhang <zhfan@google.com> 1526000558 -0700
committer android-build-merger <android-build-merger@google.com> 1526000558 -0700

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

Change-Id: I99a647a6f5b29093ce64be9c19622a3bde10a359