tree 3812ca5760f4ea1593bbf2b63d3d7d175338d6d4
parent ce7d41150d1450dbb0e883163f68267e1f169b74
parent 5eaf3cd966f76a8d6676b2b949ae97ecc505b300
author Tianjie Xu <xunchang@google.com> 1486160330 +0000
committer android-build-merger <android-build-merger@google.com> 1486160330 +0000

Merge "Avoid to call UI functions in child process" am: 0f275ae56e am: 5fa2e576f9 am: 15ab95bb63
am: 5eaf3cd966

Change-Id: Idd211a64de13886a6ca74b5bf33159d3b90cdf7d