From: Paul Duffin <paulduffin@google.com>
Date: Thu, 9 Mar 2017 14:09:23 +0000 (+0000)
Subject: Merge "Removed littlemock dependency and cleanup" am: 1ab3beeb31 am: 9a90f916d9
X-Git-Tag: android-x86-8.1-r1~24
X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fpackages-apps-Camera2.git;a=commitdiff_plain;h=8539c9df79cc773e8d6c2a369b55b3e4923915d6

Merge "Removed littlemock dependency and cleanup" am: 1ab3beeb31 am: 9a90f916d9
am: 2f6e428731

Change-Id: I30bf0cc0fb761f315ee3c3abf58d0bbac30a0147
---

8539c9df79cc773e8d6c2a369b55b3e4923915d6