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