OSDN Git Service

[automerger skipped] Merge "WFC roaming mode setting can not be used with a fixed...
authorBrad Ebinger <breadley@google.com>
Fri, 8 Mar 2019 14:56:04 +0000 (06:56 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 8 Mar 2019 14:56:04 +0000 (06:56 -0800)
am: c1bdc0d512 -s ours
am skip reason: change_id Ib2363c5d50f5231cc89f287d760ca8728b02b249 with SHA1 994d27a2a5 is in history

Change-Id: I488660be8a513d82ea04c2e89ca0ad5b67859ecf


Trivial merge