[automerger skipped] Merge "Revert "Settings: Add logical camera default switch"" into pi-dev am: 1db4027355

am: 7ed1343d0a  -s ours

Change-Id: Icddc5ec3a2d031c0021d4983952569b9aecb0b23
This commit is contained in:
Shuzhen Wang
2018-06-04 17:06:26 -07:00
committed by android-build-merger

Diff Content Not Available