OSDN Git Service

[automerger skipped] Merge changes from topic "vpn_data_accn_tests" am: b50e778fa7...
authorVarun Anand <vaanand@google.com>
Thu, 30 May 2019 21:08:06 +0000 (14:08 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 30 May 2019 21:08:06 +0000 (14:08 -0700)
am: 71d6f66d12 -s ours
am skip reason: change_id Iffd3f95fc2e11d311691a797b010edb38d2ef3c6 with SHA1 1419b0b20e is in history

Change-Id: I5843bda44deaca837e2517465df3f8d9f3f2d5d2


Trivial merge