tree 6a9dff8b98a2066bda676e8d802ab856f7cf1367
parent 50cea1a76e7d64959cb5cddfceb8e7542662bf0a
parent c4f0ff1d6cd68d20e4716119a7d6fbbacd428fe6
author Alexander Smundak <asmundak@google.com> 1591646950 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1591646950 +0000

Merge "Cherrypick aosp/1318079 and aosp/1324841" into rvc-dev