OSDN Git Service

am afb7de60: Merge "Change when sampling thread is reset during shutdown to prevent...
authorJeff Hao <jeffhao@google.com>
Mon, 8 Sep 2014 22:28:28 +0000 (22:28 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 8 Sep 2014 22:28:28 +0000 (22:28 +0000)
* commit 'afb7de600066cc5daba0112eacbfdb43f1fb9f16':
  Change when sampling thread is reset during shutdown to prevent races.


Trivial merge