commit | 08d05b2719044849efb1657efe92bcf2c29f4d68 | [log] [tgz] |
---|---|---|
author | Robin Lee <rgl@google.com> | Mon Jan 23 17:01:31 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Mon Jan 23 17:01:31 2017 +0000 |
tree | d810e24c18a230cf6355b40b0d2fb93c2f0f1b2f | |
parent | 5edf4f11012037141adfda3e9fe229529de4f516 [diff] | |
parent | e2554d51c45fe33fd0e2735e3ec7dfe8a80594af [diff] |
Merge "Disable always-on VPN in factoryReset" am: 63c14e0ab6 am: 1135d509c5 am: e2554d51c4 Change-Id: I99207281321861a3e720b5c1e2e316e12b104677