| commit | 91a0c0983fd1f2222b66165a6f1ad6e2fd3c07da | [log] [tgz] |
|---|---|---|
| author | Robin Lee <rgl@google.com> | Mon Jan 23 17:05:42 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Jan 23 17:05:42 2017 +0000 |
| tree | 455e12ca075d595f7e4c22a38f9edb4e13850697 | |
| parent | 26ba16e4d158919801e74c3fc67c15f5ba50be81 [diff] | |
| parent | 08d05b2719044849efb1657efe92bcf2c29f4d68 [diff] |
Merge "Disable always-on VPN in factoryReset" am: 63c14e0ab6 am: 1135d509c5 am: e2554d51c4 am: 08d05b2719 Change-Id: Iaccb7394994ccce66df0ab2f713fd890a8b999c8