From: Ian Rogers <irogers@google.com>
Date: Tue, 1 Apr 2014 22:56:42 +0000 (+0000)
Subject: am 52f5ecb1: Merge "Fix ThreadStress, unify ANR lock descriptions."
X-Git-Tag: android-x86-6.0-r1~3200^2~843
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=72a159d368ff2ba096085a34047a1b134beaa634;p=android-x86%2Fart.git

am 52f5ecb1: Merge "Fix ThreadStress, unify ANR lock descriptions."

* commit '52f5ecb1714a17b72182fcdf88ae7f6d817855cc':
  Fix ThreadStress, unify ANR lock descriptions.
---

72a159d368ff2ba096085a34047a1b134beaa634