tree fcd1202d718ad8ef8dcd3750251ee6bac73172f3
parent dc047e574654b222949520cd6267557c024b5e77
parent ebe36cf96c920dc00e00ea4c1e8b5b3fe19fa351
author Betty Chang <changbetty@google.com> 1578552613 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1578552613 +0000

Merge "[Mainline] To use @SystemApi to replace non-formal APIs for mainline"