Skip to content
Commit 69acf258 authored by Anton Hansson's avatar Anton Hansson Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "Tweak stubs for updatable media" am: 2c99ff00 am: 2b86731b -s ours 

am skip reason: Change-Id I498823de7315f78121975d36d6dc7667a8245085 with SHA-1 12a07676 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1402650

Change-Id: Ie7af76ecec8f0e7d7504cf1215a13b7d55006dca
parents ed63b6c5 2b86731b
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment