commit | 4719b561b5f22fe355fb92aa84ab39076abdc4e5 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Sat Feb 20 13:17:43 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Feb 20 13:17:43 2021 +0000 |
tree | f26e0bfa843c2dee659f26bcfb56e81d2336ac76 | |
parent | 7d723f696e94bdc770a0a1e9fe680e588d59fc19 [diff] | |
parent | 8682d72a9f14937f4545ee2a1b27bcdc78dc4983 [diff] |
[automerger skipped] Mark ab/7061308 as merged in stage. am: 1eb1b74673 -s ours am: 84efb330e6 -s ours am: 8682d72a9f -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: I29cf05a4cd8ba03494d51a730958bff532862f41
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.