am 0019c7b5: resolved conflicts for merge of a0eeb0b6 to lmp-dev-plus-aosp

Browse Source

* commit '0019c7b5a05a7c79e3ab9b72cae9bcdf8d22491e':
  Fix pthread_getattr_np for the main thread.

...

This commit is contained in:

Elliott Hughes 2014-08-28 04:11:48 +00:00 committed by Android Git Automerger

parent f5f59e3756 0019c7b5a0

commit 53c39aab6e

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available