tree 2f1668f2afa2054faa30e8a1d2bcac13fd3fab87
parent e8288804a131496dd7ef8ca489aa97c12262272d
parent 48a78f4852132cd0161538922bc0651e55e232a5
author Paul Duffin <paulduffin@google.com> 1488985753 +0000
committer android-build-merger <android-build-merger@google.com> 1488985753 +0000

Merge "Replace usages of littlemock with mockito" am: 0a11c83016 am: b29311bbba
am: 48a78f4852

Change-Id: I826f98625ce3fbc57f71d72bc0bfdabd3ff92b06