tree 8df9955e7d4dcd4d55dc8ac3fccd88b7e6fc2b0a
parent 906b37ec09c9f3075e92682d0929bb0fe104139d
parent 56104e6fb8e19dda719e3095f5bbe8e047a6a69b
author rleix <rayx.lei@intel.com> 1533588374 -0700
committer android-build-merger <android-build-merger@google.com> 1533588374 -0700

Merge "Fix the system_error while calling thread::join() in NativeCallbackThread."
am: 56104e6fb8

Change-Id: Idc11c245841a45882ddb90849c35e98d678947cc