commit | fe679d70ec54e5e704dd90eca58c3ada7e58bdd0 | [log] [tgz] |
---|---|---|
author | Mohammad Islam <samiul@google.com> | Tue Sep 22 12:26:22 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Sep 22 12:26:22 2020 +0000 |
tree | 870821eff2499b25507f330711d2489888a4231e | |
parent | d7fb59d8d416fd6b66bd0bc7c2a82caaeb0582d0 [diff] | |
parent | 3bb46493c35ace7a2fe633510c1db0de1ee04b24 [diff] |
[automerger skipped] Merge changes from topic "cts-shim-lib" am: 76f021adba am: 80488f9a26 am: 150786652b am: 678ca6a59e am: 3bb46493c3 -s ours am skip reason: Change-Id I523706806a1161a20fbe983b64bb8ee4e78fadbe with SHA-1 d4c1890d72 is in history Original change: https://android-review.googlesource.com/c/platform/cts/+/1432641 Change-Id: I672af4f56866e94f61332406c27276065577de3e