commit | 168eaf1481a0852abd355bd56a6b8a993f4ceda2 | [log] [tgz] |
---|---|---|
author | Chia-chi Yeh <chiachi@android.com> | Mon Dec 12 13:15:34 2011 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 12 13:15:34 2011 -0800 |
tree | 8cef08e323746a2ae01800c70e083ad67d7fcb9a | |
parent | 568a6fce2a79dae365fc5434a7ea94f1c67fd3f6 [diff] | |
parent | 87f89d18507477fdf0029da8ace196a294a34cfe [diff] |
am fa71962f: am 46a4e81d: Merge "VPN: delete the "abort" file before starting VPN daemons." into ics-mr1 * commit 'fa71962fe4595f484071ac0deb23f68d44932d83': VPN: delete the "abort" file before starting VPN daemons.