OSDN Git Service

Merge "[Setting] Fix merge conflict"
authorBonian Chen <bonianchen@google.com>
Tue, 26 Nov 2019 10:02:03 +0000 (02:02 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 26 Nov 2019 10:02:03 +0000 (02:02 -0800)
commitec4e1a14e0ddd9ce9f5b400325de64ba885e0c45
tree256269de50bbcb5c7e87c19d4e8e444d5250a40e
parentbfa1f2979e464ac7daa659d61a0a73d35c0d8f8b
parent67805d8e5e6019f2113ce8ef9c4f5114fd5e12ce
Merge "[Setting] Fix merge conflict"
am: 67805d8e5e

Change-Id: Ie7f67b9a80efdceb1e3c5fd3054dd4eb71c4dcd8