OSDN Git Service

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

Change-Id: Ieaf04dac3d587c557801fa606ad65c3674b21fea