OSDN Git Service

[automerger skipped] Merge "Fix API in CaptivePortal and ConnectivityManager" am...
authorRemi NGUYEN VAN <reminv@google.com>
Mon, 25 Mar 2019 03:10:38 +0000 (20:10 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 25 Mar 2019 03:10:38 +0000 (20:10 -0700)
am: cd08ecfdfd -s ours
am skip reason: change_id I09545c00af3519dbf141dd5951b28f49e37b3e80 with SHA1 24ec3ff006 is in history

Change-Id: I793a60492ba7b63c6dea2937e7fc651a1ab617b9


Trivial merge