From: Mathieu Chartier <mathieuc@google.com>
Date: Fri, 9 Oct 2015 01:47:19 +0000 (+0000)
Subject: am e62ab9f4: (-s ours) am f3baa36f: am 22e0ce3a: DO NOT MERGE Add locking to prevent... 
X-Git-Tag: android-x86-7.1-r1~1186^2~157
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=06deb835bf9bf94d9e2d9673aa0e80f52a204a4a;p=android-x86%2Fart.git

am e62ab9f4: (-s ours) am f3baa36f: am 22e0ce3a: DO NOT MERGE Add locking to prevent races between setting class methods and marking

* commit 'e62ab9f4e9e66c2fff4a99d540a53f94d0ab7381':
  DO NOT MERGE Add locking to prevent races between setting class methods and marking
---

06deb835bf9bf94d9e2d9673aa0e80f52a204a4a