Merge "Fix vpn branded string usage" into nyc-mr1-dev

am: 9db47b0f49

Change-Id: Ie3a6a3840bf047e8ba6126e563c93cba374b4d8e
This commit is contained in:
Jason Monk
2016-10-22 02:30:53 +00:00
committed by android-build-merger

Diff Content Not Available