tree aa8565a365f7aec8f72b95bfaaa81329f1db3804
parent cd3b01611d3fffc70c704b796f2aefa6d12bf077
parent e4e4f4e88de083bf4c918418658b620961f33847
author Elliott Hughes <enh@google.com> 1501720292 +0000
committer android-build-merger <android-build-merger@google.com> 1501720292 +0000

Merge "Fix reference to out of scope local in adb_thread_setname." am: b31ca1a64f am: 15d565bbca am: b664dd38b9
am: df5ecefde4

Change-Id: I27605565fbbf5b07939c8df4a686ea25bcb62669