tree 393c107474c451624bcfa0879cadad572a879511
parent 4bde9975b2cd79f99d4bafb6772bc6f43d419576
parent 4936b689521aa10882b6b59afc4b812dd413b56f
author Elliott Hughes <enh@google.com> 1394654220 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394654220 +0000

am 4936b689: Merge "Remove test_thread_max."

* commit '4936b689521aa10882b6b59afc4b812dd413b56f':
  Remove test_thread_max.