From: Paul Duffin <paulduffin@google.com>
Date: Tue, 6 Jun 2017 08:01:41 +0000 (+0000)
Subject: Merge "Added android.test.mock and android.test.mock.sdk targets" am: 46f8d427c4
X-Git-Tag: android-x86-9.0-r1~3069^2~4^2~3
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e468747115da8a027a5b782fd2fa88547043b3ed;p=android-x86%2Fframeworks-base.git

Merge "Added android.test.mock and android.test.mock.sdk targets" am: 46f8d427c4
am: de30ee2d40

Change-Id: I4f615991b43350df9748d7f05fdcf5501eff135d
---

e468747115da8a027a5b782fd2fa88547043b3ed