[automerger skipped] Merge "Extend RollbackManagerService to handle S extensions" am: 9f2c15890c am: f4930cfd33 am: 4b72f351ac -s ours

Browse Source

am skip reason: Change-Id I2de18f67f21ea6c57d612829749edeaa11378f41 with SHA-1 a021b767a6 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If339701a0fe9a65583821094f3ea1ae2ca591cf7

...

This commit is contained in:

Anton Hansson

2020-12-31 12:39:19 +00:00

committed by Automerger Merge Worker

parent 0883daddf1 4b72f351ac

commit 3756bb9cd9

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available