tree 8a8ba5d77bdbf50dc1c913dc781a5c2fde8439e5
parent 6f6d2eea16b2bf7792cc332a89512aa2e21edcce
parent 324acdce6933a90e0d6821fb367627bba8073e37
author Tao Wu <lepton@google.com> 1474545323 +0000
committer android-build-merger <android-build-merger@google.com> 1474545323 +0000

Merge "Ignore setsid error in some cases." am: 3562fd0fa8
am: 324acdce69

Change-Id: I330be058b8c0d7b175845b30d59f091432d62f6c