commit | 8f4ba8db37352ad6725378d88faa40adf908112b | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Wed Nov 17 10:20:49 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Nov 17 10:20:49 2021 +0000 |
tree | 67dd4a548e739cf541fd2203a1857dab25a7fc27 | |
parent | 2b504ce2803ab941a96de708100dc31772272c58 [diff] | |
parent | 29c36331524443550769f60af6f55bb31430f38f [diff] |
[automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am: 4b612e4d20 -s ours am: a5fab2b893 -s ours am: 29c3633152 -s ours am skip reason: Merged-In I029d46edde5b61f20241bab46b97d58c5fe71702 with SHA-1 91a4afdb85 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/MediaProvider/+/16279401 Change-Id: Ic039b8197f1a0591e8308fb787ef52743f17c77d