| commit | 22ff1111439575f25d288bb7f76fd9c5287511fd | [log] [tgz] |
|---|---|---|
| author | Alexander Dorokhine <adorokhine@google.com> | Wed Sep 22 21:54:08 2021 -0700 |
| committer | Alexander Dorokhine <adorokhine@google.com> | Wed Sep 22 21:54:08 2021 -0700 |
| tree | 6c940b8484326a75091db3b9407caab4607469aa | |
| parent | 3bccac70fb3269ac0e2feb73fe23d8e84affb21d [diff] | |
| parent | 8555f998fccca3aea3f6f67d44fce04775ddea97 [diff] |
Merge remote-tracking branch 'aosp/upstream-master' into androidx-main * aosp/upstream-master: Remove non-upstream files from upstream-master. Change-Id: I829c34d62826497d910992e31a3e9a5c155ed452