OSDN Git Service

am e62ab9f4: (-s ours) am f3baa36f: am 22e0ce3a: DO NOT MERGE Add locking to prevent...
authorMathieu Chartier <mathieuc@google.com>
Fri, 9 Oct 2015 01:47:19 +0000 (01:47 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 9 Oct 2015 01:47:19 +0000 (01:47 +0000)
* commit 'e62ab9f4e9e66c2fff4a99d540a53f94d0ab7381':
  DO NOT MERGE Add locking to prevent races between setting class methods and marking


Trivial merge