OSDN Git Service

[automerger skipped] Merge "Move Setting constants for NetworkStack" into qt-dev
authorChiachang Wang <chiachangwang@google.com>
Mon, 22 Apr 2019 10:53:44 +0000 (03:53 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 22 Apr 2019 10:53:44 +0000 (03:53 -0700)
am: 9509eb8716 -s ours
am skip reason: change_id I6820300c412f94989a5fce7bd6c6f2a3b983b96e with SHA1 e06af927c9 is in history

Change-Id: Ie18c6fd8018b870b2476bb503b4929e584faa888


Trivial merge