commit | e2554d51c45fe33fd0e2735e3ec7dfe8a80594af | [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 | ae01b8d2e24c591217091c1007e105aa60fd17f1 | |
parent | 42bd98f1ce474a9495573115115f2a8dc657ed93 [diff] | |
parent | 1135d509c587f9b584cb230c28f9d4690f8a108a [diff] |
Merge "Disable always-on VPN in factoryReset" am: 63c14e0ab6 am: 1135d509c5 Change-Id: I66b6721932ae8798cbb406cafa04ed0c92fe47f6