OSDN Git Service

[automerger skipped] Merge "Moved data settings to phone" am: bcd6a7db39 am: 67475a5c66
authorJack Yu <jackyu@google.com>
Fri, 21 Dec 2018 03:28:54 +0000 (19:28 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 21 Dec 2018 03:28:54 +0000 (19:28 -0800)
am: a91d29f5f0  -s ours

Change-Id: Ib7852dc376747b05a6e7ce1fb3391418d7ab01ef


Trivial merge