OSDN Git Service

Merge "[Setting] Fix merge conflict" am: 67805d8e5e
authorBonian Chen <bonianchen@google.com>
Tue, 26 Nov 2019 10:11:19 +0000 (02:11 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 26 Nov 2019 10:11:19 +0000 (02:11 -0800)
commit42eec15834dac78c408437c6a707c34cbadb2aac
tree57bebe0e547579784aa1a2749c182793edbd98c4
parent14990a19015ebff77429161e75afd9ee5fc25127
parentec4e1a14e0ddd9ce9f5b400325de64ba885e0c45
Merge "[Setting] Fix merge conflict" am: 67805d8e5e
am: ec4e1a14e0

Change-Id: I716436a78316eb111fa53bb6834d81934f7830f1