| commit | fee29f30b551b016a0269f9d791efa5badc16f8b | [log] [tgz] |
|---|---|---|
| author | Hai Zhang <zhanghai@google.com> | Tue May 11 22:44:09 2021 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue May 11 22:44:09 2021 +0000 |
| tree | 98ed2211b621e08c0ec1f2a17ebe4a18d8a18532 | |
| parent | cccaa5a954cb017d9c2a486dee34b4f2842b936b [diff] | |
| parent | 4d01a45c44da726927a736c81d71c72de04e23d7 [diff] |
Merge "Remove workaround for R class conflict in Settings unit test." into sc-dev