tree 2fc465d483822bb16b4293d2653be5ff4ab11a10
parent 917bb57021d8d325394bc47b687f4f06ff478228
parent 2600bbe271e03373bd59862ca4f13c61603f90ef
author Android Build Merger (Role) <android-build-merger@google.com> 1484093766 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1484093770 +0000

Merge changes from topic 'am-7c32574535fe4d59a550a86c30095868'

* changes:
  Merge changes Ia1f2535c,I9ca93f31,If5b53f6f,I119e0bfc am: 98d86fe2b7 am: c6d9f0fbce am: 367f70cca4 am: 6c852fb228
  Dynamically add the webview_zygote's preloaded APK to the zygote FD whitelist. am: 54e387ddbe am: 839a185b2e am: df781cc514 am: 15fe73846c
  Split core/jni/fd_utils-inl.h into a .h/.cpp pair. am: 8225b7c951 am: 63a7fe6de8 am: 024793713f am: 4a27be1952  -s ours
  Zygote: Additional whitelisting for legacy devices. am: f701ba36b3 am: 7a69406767 am: 647986fd54 am: e34b213b30