tree 862eceb74a0f11b17d2ab3d6a9d7b83324ea3636
parent af2110cf897ea7f9d5364234cf50e67036876992
parent bec3a79a2751ca5ba6871c94bdbc167004575471
author Narayan Kamath <narayan@google.com> 1478725866 +0000
committer android-build-merger <android-build-merger@google.com> 1478725866 +0000

Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into nyc-dev am: 12f98789bf am: acdb6bb1aa am: e3d31ebc0e am: dac1d242ab am: 2b3a352a4d
am: bec3a79a27

Change-Id: I9973287f85c8f40a15e67ba4069c6904216342cb