Repository files (latest commit first)

Filename	Latest commit message	Latest commit date
Dan Albert 61bb568007 resolve merge conflicts of d7f2320945 to master ... Bug: None Test: I solemnly swear I tested this conflict resolution. Change-Id: I7256999a13b713607cfb4c844bf1bc7b37b827a7		2019-01-24 14:46:02 -08:00
..
android	Merge changes I2ddfef0c,I49bee0c9 am: ba4d5be35a am: 11c58491ff	2019-01-21 11:28:55 -08:00
com/android	Merge "Revert "Whitelist packages from VPN lockdown.""	2019-01-24 21:08:46 +00:00