refs/heads/android12-mainline-art-release - platform/external/libbackup

commit: b3149b133c5c227f29258e67756be949afa319c8
[log]
author: Xin Li <[email protected]>
Sat Feb 20 15:48:19 2021 +0000
committer: Automerger Merge Worker <[email protected]>
Sat Feb 20 15:48:19 2021 +0000
tree: 1ac89449162ba88cb338516808b251dca83407d8
parent: 16e9f5e8868ad9bc21d104c2b4f578ff3df0f8a2 [diff]
parent: 0584a973d2ce98f018d975a07aa982c26db6f928 [diff]

[automerger skipped] Mark ab/7061308 as merged in stage. am: 1c202c87d7 -s ours am: 1ddd8b25e0 -s ours am: 0584a973d2 -s ours

am skip reason: Change-Id I790ce8d5e5e573ab896118d92c351bb43f42025c with SHA-1 500d7c41bb is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0a28c512432ff703e0edf8824796045538006b22

tree: 1ac89449162ba88cb338516808b251dca83407d8

src/
Android.bp
AndroidManifest.xml
build.gradle
LICENSE
METADATA
MODULE_LICENSE_APACHE2
NOTICE
OWNERS
README.version