OSDN Git Service

Merge "Do not use npic image for oat file assistant tests." am: 2c532ed685
authorRichard Uhler <ruhler@google.com>
Fri, 20 Jan 2017 08:54:02 +0000 (08:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Jan 2017 08:54:02 +0000 (08:54 +0000)
am: 794a109a59

Change-Id: Id46f1909a9271692a45a2cd476c840f38d948227


Trivial merge