commit | 1135d509c587f9b584cb230c28f9d4690f8a108a | [log] [tgz] |
---|---|---|
author | Robin Lee <rgl@google.com> | Mon Jan 23 16:47:58 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Mon Jan 23 16:47:58 2017 +0000 |
tree | 6b08a8aac1b36fa484f94e5c14690d724247d0fc | |
parent | fc97509a3e7e49ee80505d49cd8cd4bbe4b197d9 [diff] | |
parent | 63c14e0ab696087bf6b133e1e2a2ca198e45db82 [diff] |
Merge "Disable always-on VPN in factoryReset" am: 63c14e0ab6 Change-Id: I021b288e3db17ddefbea3645fd282e3ee123a6e8