commit | 476bfca7f6b1d0fb0e4563ef4a1230e4cfe787c4 | [log] [tgz] |
---|---|---|
author | Robin Lee <rgl@google.com> | Mon Mar 27 23:26:47 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Mon Mar 27 23:26:47 2017 +0000 |
tree | 5a9694160ed8928c32aad04b028e01d0625bc0f4 | |
parent | 65cc4029f4e4f69d8d49fa8618a7f35c3a328fc4 [diff] | |
parent | afbdf60e1d4cafe0f894fe8e8e5bfa49e47c80b2 [diff] |
Merge "Add null checking to two protectFromVpn calls" am: 335d482d9d am: afbdf60e1d Change-Id: I85e0fd5ffdee88af50158c09b776ff2615b9e85a