OSDN Git Service

Merge "Revert "Settings: Add logical camera default switch"" into pi-dev
authorShuzhen Wang <shuzhenwang@google.com>
Mon, 4 Jun 2018 23:06:07 +0000 (16:06 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 4 Jun 2018 23:06:07 +0000 (16:06 -0700)
am: 1db4027355

Change-Id: I0d822607285c7b4405f6ef85cf06a029831e018f

1  2 
res/values/strings.xml

Simple merge