From: Paul Duffin <paulduffin@google.com>
Date: Tue, 21 Feb 2017 18:20:09 +0000 (+0000)
Subject: Merge "Stop using junit classes in production" am: f1ec8df547 am: d382e794e9
X-Git-Tag: android-x86-8.1-r1~17
X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fpackages-apps-Gallery2.git;a=commitdiff_plain;h=ca06c6d8b0ba328268636557e2922da21964a927

Merge "Stop using junit classes in production" am: f1ec8df547 am: d382e794e9
am: 508d9e47f4

Change-Id: I1fa8a30c27e462604b1625d6f78031a12117f640
---

ca06c6d8b0ba328268636557e2922da21964a927