OSDN Git Service

Merge "Fix vpn branded string usage" into nyc-mr1-dev
authorJason Monk <jmonk@google.com>
Sat, 22 Oct 2016 02:30:53 +0000 (02:30 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 22 Oct 2016 02:30:53 +0000 (02:30 +0000)
am: 9db47b0f49

Change-Id: Ie3a6a3840bf047e8ba6126e563c93cba374b4d8e


Trivial merge