tree 39bc38af1973b979ebd794e164a9ddf9c4a36201
parent 9262c04be3656f948e7b56cd3c5f6916c560a8d4
parent fc9e4fbc0853ef5efcbb4c0eaeba009b47ce7dda
author Junyu Lai <junyulai@google.com> 1581734142 +0000
committer Junyu Lai <junyulai@google.com> 1581734142 +0000

Merge "[SP16] Address comments on aosp/1172143" am: fc9e4fbc08

Change-Id: I9c826c08320e112466dea0d2628f3447ebcb7d02