| commit | 234d052fc9ef72c05027e6b063866e56aad979b7 | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Tue Apr 05 17:28:12 2022 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Apr 05 17:28:12 2022 +0000 |
| tree | daea2a0dda1eafcb5ba685cac424d18a9909596c | |
| parent | 55f1659521899f21692a3243fde094969a74a6d0 [diff] | |
| parent | 76e7d6a249539b0ff254a5129244535d7d0c74ea [diff] |
Merge changes I385b17e0,Ia6cd02db,Ifa5f8959,Ie6cf2440,I5491a341, ... * changes: Import AndroidX mediarouter libraries from build 7930980. Move localbroadcastmanager to legacy artifacts Move legacy-support-core-utils to androidx-legacy Import AndroidX benchmark libraries from build 8099018. Import AndroidX benchmark libraries from build 7868412. Resolve difference between AOSP and internal