OSDN Git Service

Merge "Add branded VPN messages to go along with branded icons am: 802bc6ee06 am...
authorJason Monk <jmonk@google.com>
Fri, 2 Sep 2016 20:02:16 +0000 (20:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 2 Sep 2016 20:02:16 +0000 (20:02 +0000)
commitbb84643f2fa34cff5d966d18bf1364d603f4dd77
tree8e72642c414bf9915ba04066906529faf5be0f45
parentbe14cbf18e12f5b978637b8b02f61e13f8da588c
parent19602e0344e91ab23f0a6d5da48bd18c18eec8d7
Merge "Add branded VPN messages to go along with branded icons am: 802bc6ee06 am: 57bf03152c" into nyc-mr1-dev-plus-aosp
am: 19602e0344

Change-Id: I30f6a5d528f9ad549d0ecdcc1ec6ae2a1f5ebb59