Chih-Hung Hsieh ed935c32f4 resolve merge conflicts of 76ce8e5 to stage-aosp-master ...

Change-Id: I4b4ca9906373a95776d2da8ba2fa39a4a78e2a30

2016-08-11 16:48:46 -07:00

..

Barrier.h

resolve merge conflicts of 5152fd9 to stage-aosp-master

2016-07-21 18:13:31 -07:00

Future.h

…

Signal.h

…

Task.h

…

TaskManager.cpp

Fix clang-tidy warnings in libs/hwui.

2016-08-10 23:26:59 +00:00

TaskManager.h

resolve merge conflicts of 76ce8e5 to stage-aosp-master

2016-08-11 16:48:46 -07:00

TaskProcessor.h

…