OSDN Git Service

Merge "Stop using junit classes in production" am: f1ec8df547 am: d382e794e9
authorPaul Duffin <paulduffin@google.com>
Tue, 21 Feb 2017 18:20:09 +0000 (18:20 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 21 Feb 2017 18:20:09 +0000 (18:20 +0000)
am: 508d9e47f4

Change-Id: I1fa8a30c27e462604b1625d6f78031a12117f640


Trivial merge