commit | 3fd39658c647b18f397941bc6ae95d93b2ec21cc | [log] [tgz] |
---|---|---|
author | Bob Badour <bbadour@google.com> | Tue Feb 16 23:02:17 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Feb 16 23:02:17 2021 +0000 |
tree | 282ecb140139a5cff47b139b1d2b936c92fefd72 | |
parent | 823fafe16699c6b1e4e2d0833d18b7f3073a30ac [diff] | |
parent | b648206c8e3bbdf766aa0bc1750c24ef8d7f37d5 [diff] |
Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/mockito" am: 2d7cca944c am: 6706f18ce2 am: b648206c8e Original change: https://android-review.googlesource.com/c/platform/external/mockito/+/1588954 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I00a8ae06986b512e3a9b7e15c50936fe6b6f9d90