Commits
Jeff Sharkey authored and Android Git Automerger committed e7f15b2286fM
am 6c73eb8a: am 82f479d0: Merge "Cleaner controls between Vpn and init services." into jb-mr1-dev * commit '6c73eb8a73449ff87964936a1cc3e2d463fa7fab': Cleaner controls between Vpn and init services.
Showing diff to6c73eb8a734