tree 576c17b457f2f82d87de03fcedb35f4b8e894f90
parent e53e500eacf98eef2281ac947282a0c86e2a0f65
parent 1ec7235ebe35c3ece6c5f6a737a14494358dcc0c
author Kevin Hufnagle <khufnagle@google.com> 1574114770 -0800
committer android-build-merger <android-build-merger@google.com> 1574114770 -0800

Merge "docs: Updated desc. of lockNow() method and its overload" into qt-dev
am: 1ec7235ebe

Change-Id: Iec60117a620bf655859555e8d5e3bc028e73b8a0