Commits
Jeff Sharkey authored and Android Git Automerger committed cb0a030f97fM
am ab33d668: am 17671ff0: am ba0372db: Merge "Parcel VpnProfile without using disk format." into jb-mr1-dev * commit 'ab33d668ff5bb4466c58d6ab5457080cfe76ff07':
Showing diff to93fb8ad1182