| commit | 73b719e9fa0d06775a6c9db9220389becbce57a2 | [log] [tgz] |
|---|---|---|
| author | Anton Hansson <hansson@google.com> | Wed Mar 31 10:45:28 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 31 10:45:28 2021 +0000 |
| tree | e17ec147fdc7acbcf518f40ec5bc294c1abc4397 | |
| parent | cc47e88bec31c0bc4049dd89780aab5fb0d4605c [diff] | |
| parent | e95fd0599f6bcca26ad512e1430d6bf9b412d860 [diff] |
[automerger skipped] Merge "Use framework-annotations-lib" am: d6d4011f58 am: 6d5a597fb7 am: e95fd0599f -s ours am skip reason: skip tag Change-Id I441270743056a8c6cc8007dfdac361995a9e2c28 with SHA-1 9258dbaf26 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/1657981 Change-Id: If3ab93bfc62615edcb5f9096de480b6c7298b407