| commit | 532177b7a41ee3e355827881563cfaca5a9e2705 | [log] [tgz] |
|---|---|---|
| author | Roland Levillain <rpl@google.com> | Wed Feb 28 13:11:13 2018 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Feb 28 13:11:13 2018 +0000 |
| tree | f60e00f2b48fb286fb2bef7b4d2fdc53e8f32888 | |
| parent | 481aa21f02013c9107b270d7ebe5ecd2d8f52f8a [diff] | |
| parent | e03b0f0ef5669e6cd2dee74eca762e062a2552de [diff] |
Merge "Fix an incorrect use of ScopedContentionRecorder in ReaderWriterMutex." am: c1e5889277 am: f01b21f01f am: e03b0f0ef5 Change-Id: I3a4c82a758bd0f203a6677b712e620db673f9aa7