OSDN Git Service

Merge changes from topic 'art_tests'
authorColin Cross <ccross@android.com>
Thu, 15 Sep 2016 21:52:27 +0000 (21:52 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 15 Sep 2016 21:52:27 +0000 (21:52 +0000)
am: 7d26164308

Change-Id: I64cfdc5ea42dd9f439129c106fbc814f38eb192b


Trivial merge