tree 51c5ddebf29eb06605427877694b1eebe12d34d0
parent 800a2107428062666700208d490b51a1414d7f22
parent cd389642d6f09ddfed51ad473200b10825591607
author Jeff Sharkey <jsharkey@google.com> 1587569160 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1587569160 +0000

Merge changes from topic "apr21" into rvc-dev

* changes:
  Fix regression in ringtone translations.
  Fix lock inversion bug.