| commit | 0eab79ca1995a75f8e3b6344c83382bec1144d63 | [log] [tgz] |
|---|---|---|
| author | Ryan Lin <ryanlwlin@google.com> | Thu Jan 06 09:04:38 2022 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jan 06 09:04:38 2022 +0000 |
| tree | b3f221fbfe86848e935815aaac8fa9c3671d46e2 | |
| parent | ec20815f3e7a47386d4918d463139e1827010f63 [diff] | |
| parent | 1a7379b9df033d1cc342c899795d8f0afc9f5823 [diff] |
Merge "Because the B1 string of button1 conflicts with the project name of our project." into sc-v2-dev