tree d2dc4871514390f2d7ba38400645b0b448988d82
parent 08308df1efe5e0fd821db3cf73d45006d8253165
parent ed8c307213d2a88e4e256bdb3698f082e9adc7a2
author Colin Cross <ccross@android.com> 1452895254 +0000
committer android-build-merger <android-build-merger@google.com> 1452895254 +0000

Merge "Implement GetThreadCount for Linux." am: 0374ec7859
am: ed8c307213  -s ours

* commit 'ed8c307213d2a88e4e256bdb3698f082e9adc7a2':
  Implement GetThreadCount for Linux.