OSDN Git Service

Merge "Merge "Merge changes from topic 'do_not_roam_on_traffic' into oc-dr1-dev am...
authorNingyuan Wang <nywang@google.com>
Thu, 3 Aug 2017 01:27:18 +0000 (01:27 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 3 Aug 2017 01:27:18 +0000 (01:27 +0000)
am: 60d63fa4fb

Change-Id: I68a0642f288973a25d1756508e23313f2e318c06


Trivial merge