tree d588b9ae6ea8a049b3c1d298417b3b09c5e32ff0
parent 8533a4cc6238da68db60d6fa1356fb8a87adaa1f
parent 10d9320c3ad57f68d85c181dbdc8160a69825bde
author David Sehr <sehr@google.com> 1559697500 -0700
committer android-build-merger <android-build-merger@google.com> 1559697500 -0700

Merge "Add system option to disable lock profiling" into qt-dev
am: 10d9320c3a

Change-Id: I59355027ead8d03df7adc6d424c4b8e18b0ea78c