| commit | f6c57b8f2f2ff19c0e869300e1256ccd8f409659 | [log] [tgz] |
|---|---|---|
| author | Robin Lee <rgl@google.com> | Mon Jan 23 16:54:59 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Jan 23 16:54:59 2017 +0000 |
| tree | d61e3a666c27e8f1af991b7b1b2fa5f9474b9c25 | |
| parent | e7234fc716036e98deb0792ad3642d2f0d6f0676 [diff] | |
| parent | adb7a1c631bdd9a129496d082d49289126f8921b [diff] |
Merge "Disable always-on VPN in factoryReset" am: 9847e78b72 am: adb7a1c631 Change-Id: I66b6721932ae8798cbb406cafa04ed0c92fe47f6