| commit | aa0406b3f1b60d13269bcdadb89a1a26ee120dae | [log] [tgz] |
|---|---|---|
| author | Mathieu Chartier <mathieuc@google.com> | Thu May 15 00:34:46 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 15 00:34:46 2014 +0000 |
| tree | 9e1ba53a941a629ab92db16680951594c57f59cc | |
| parent | a931a91820aa55a96473f69980d58e4fd092e007 [diff] | |
| parent | 6d0a70206867933a715b93800fc703f4a044ae3c [diff] |
am 6d0a7020: Merge "Fix race in inflating thin locks." * commit '6d0a70206867933a715b93800fc703f4a044ae3c': Fix race in inflating thin locks.