tree 2c35fc31b329375b3033ca447bfe9cc8a8636523
parent a4fa1a11c8443ffd9fe70c4af69b6c83883a053d
parent 1ab3beeb31f098d07254b2bb25c9be37c8e68388
author Paul Duffin <paulduffin@google.com> 1489068171 +0000
committer android-build-merger <android-build-merger@google.com> 1489068171 +0000

Merge "Removed littlemock dependency and cleanup"
am: 1ab3beeb31

Change-Id: Ib32db9eaa28e62b18ca867b09531836742f17785