summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2020-04-10 03:17:06 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-04-10 03:17:06 +0000
commitfbe7c41a603c4d0212ccf2fc6e91139b77143d52 (patch)
tree07bc51a73db7fbc9ab953d85d39762df9084f6eb
parent156672ff09b574a1a702ae3962b5c6ee72a03193 (diff)
parente0e022e52b7f8169eaef697aacaeb4e2a746288c (diff)
downloadmockito-fbe7c41a603c4d0212ccf2fc6e91139b77143d52.tar.gz
[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: e0e022e52b -s ours
am skip reason: subject contains skip directive Change-Id: I795c5c8e61ba209857351eb1e77a247fdb3d8386
0 files changed, 0 insertions, 0 deletions