tree dbf4e041f5ec2a01d7f5ef3976de1899014d3cde
parent bfdcaaf25df1a871a750e3069c17b88272ef50fa
parent c33698857eda09b353ea4e0af75048ba5b3b0e41
author Edgar Wang <edgarwang@google.com> 1620458977 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1620458977 +0000

Merge "Considering to mainline moudle to move some resource to v31" into sc-dev