| commit | 17ec37bcf66147094fd11d41fe7dab5d466be8ab | [log] [tgz] |
|---|---|---|
| author | Mathieu Chartier <mathieuc@google.com> | Fri May 16 17:49:38 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 16 17:49:38 2014 +0000 |
| tree | 78ac4c0e4ffef2f6dd96c0f31e3708dbdb70e17b | |
| parent | a97983effd1a69803f79adea87afd686364243f7 [diff] | |
| parent | 73eb1c3be2094b729049d1c2216f7677647b13b8 [diff] |
am 73eb1c3b: am 2aab528b: am 49f0ca76: Merge "Change ObjectLock to take Handle instead of Handle pointer." * commit '73eb1c3be2094b729049d1c2216f7677647b13b8': Change ObjectLock to take Handle instead of Handle pointer.