tree 6a85db9171ef0b633f0e8fb001bc0e4f3134c4bc
parent 83be5fdebb2f2ab4b9b16170d38ce9978dd1c94b
parent f45a1a0fe62404e7e67d5aaf3ef388b3f693fda2
author Narayan Kamath <narayan@google.com> 1479130482 +0000
committer android-build-merger <android-build-merger@google.com> 1479130482 +0000

Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into lmp-dev am: d60156dfc6 am: fd23b9d509 am: b0a7831375 am: 5594cfc2c3 am: 6ca924b884 am: ae457e03b7 am: 0c8da8aa05 am: 1f9abe310f
am: f45a1a0fe6

Change-Id: Ie1cabf78ed27b3110e9b89c45c4fd02a4985231d