tree 9a763722edac743ffc04fd1b8781b647f3a65fd8
parent a8764c46aa30dc4a9914de443f74a6fcb002e336
parent 5fa2e576f9b922675b364afc58f34e11ec7f7ce7
author Tianjie Xu <xunchang@google.com> 1486160060 +0000
committer android-build-merger <android-build-merger@google.com> 1486160060 +0000

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

Change-Id: I83d52f51ab6c788cc67a75ca6f7a46cd2f8289cd