| commit | 06deb835bf9bf94d9e2d9673aa0e80f52a204a4a | [log] [tgz] |
|---|---|---|
| author | Mathieu Chartier <mathieuc@google.com> | Fri Oct 09 01:47:19 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 09 01:47:19 2015 +0000 |
| tree | 8eb007370d048e0f7133eff5e8946914c210994c | |
| parent | 83f19d06ebc332878045782e2ec653677164bd2c [diff] | |
| parent | e62ab9f4e9e66c2fff4a99d540a53f94d0ab7381 [diff] |
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