| commit | 5c709185ef232d27a0d0ebb5ee17be7f46652dae | [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 | 265888b307ffe112df09c68b6f20de013fe33c7a | |
| parent | 157ac7a76a1605e435c2206d245995921280608b [diff] | |
| parent | f6c57b8f2f2ff19c0e869300e1256ccd8f409659 [diff] |
Merge "Disable always-on VPN in factoryReset" am: 9847e78b72 am: adb7a1c631 am: f6c57b8f2f Change-Id: I99207281321861a3e720b5c1e2e316e12b104677