OSDN Git Service

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

Change-Id: Ib40f6e36e7de74d3f37ee8c305ebcfdd0c9caae4


Trivial merge