commit | 84efb330e621544a4c6776fbac46b9852ee346e7 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Sat Feb 20 11:37:04 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Feb 20 11:37:04 2021 +0000 |
tree | f26e0bfa843c2dee659f26bcfb56e81d2336ac76 | |
parent | fc0b1ee7f97bd8c2528aba3909b3544c3e33fb81 [diff] | |
parent | 1eb1b7467367104708a670129f9366f42c72f18a [diff] |
[automerger skipped] Mark ab/7061308 as merged in stage. am: 1eb1b74673 -s ours am skip reason: Change-Id Id2d671821ba45020e3ff4aa927af3dba9cd24a37 with SHA-1 c1ca6088e3 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I58cb8e9029d2f8719b3162e304b85b2b9ea8358a
Licensed under either of
at your option.
Unless you explicitly state otherwise, any contribution intentionally submitted for inclusion in the work by you, as defined in the Apache-2.0 license, shall be dual licensed as above, without any additional terms or conditions.