tree 3d12d7cf0f64cd36b4944927ba5d28f8f7596c2b
parent 62a07b6f6ac8e9cb4128045ca5e3451fce822da8
parent e65f8bedec4b479abfe18c53ccf8828960302cf2
author Pierre Imai <imaipi@google.com> 1458752010 +0000
committer android-build-merger <android-build-merger@google.com> 1458752010 +0000

Merge "Add C++ thread annotations support to core."
am: e65f8be

* commit 'e65f8bedec4b479abfe18c53ccf8828960302cf2':
  Add C++ thread annotations support to core.