OSDN Git Service

[automerger skipped] Merge "Settings: Add logical camera default switch" into pi...
authorShuzhen Wang <shuzhenwang@google.com>
Sat, 19 May 2018 01:51:13 +0000 (18:51 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 19 May 2018 01:51:13 +0000 (18:51 -0700)
am: 94f80c719a  -s ours

Change-Id: I161d7bbb078320d0dbd43ed08dc13fe5791d8fa8


Trivial merge