am d1e93240: (-s ours) am 64e1e15d: Merge "Restore Vpn advanced options on re-init or rotate" into mnc-dev

Browse Source

* commit 'd1e93240aadca200462de351415abed5e856b58c':

...

This commit is contained in:

Robin Lee

2015-08-27 11:31:17 +00:00

committed by Android Git Automerger

parent 62b24c74a9 d1e93240aa

commit 6d55794327

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available