am ba14a447: am e6caf046: Merge "Fix issue with Thread.setName hanging after Thread...

author Brian Carlstrom <bdc@google.com>

Thu, 28 Aug 2014 23:02:13 +0000 (23:02 +0000)

committer Android Git Automerger <android-git-automerger@android.com>

Thu, 28 Aug 2014 23:02:13 +0000 (23:02 +0000)
author Brian Carlstrom <bdc@google.com>
Thu, 28 Aug 2014 23:02:13 +0000 (23:02 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Thu, 28 Aug 2014 23:02:13 +0000 (23:02 +0000)
diff --cc runtime/debugger.cc
Simple merge
diff --cc runtime/thread_list.cc
Simple merge
author	Brian Carlstrom <bdc@google.com>
	Thu, 28 Aug 2014 23:02:13 +0000 (23:02 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Thu, 28 Aug 2014 23:02:13 +0000 (23:02 +0000)
		1	2
runtime/debugger.cc	patch \|	diff1 \|	diff2 \|	blob \| history
runtime/thread_list.cc	patch \|	diff1 \|	diff2 \|	blob \| history