OSDN Git Service

Merge "Make test 146 run with secondary dex file in classpath." am: 1669fe3
authorAlex Light <allight@google.com>
Fri, 1 Apr 2016 18:59:20 +0000 (18:59 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 1 Apr 2016 18:59:20 +0000 (18:59 +0000)
commitb45b738933fe913dfec10da7bd256e8b60b62297
treea28a9f709e63bab4894a1c23ce263fc149e17313
parent42caf2bccb187bb1c799ca578faa96a66f801c48
parent233a587e41101dc8de96d1942fbf7d10e97d31f0
Merge "Make test 146 run with secondary dex file in classpath." am: 1669fe3
am: 233a587

* commit '233a587e41101dc8de96d1942fbf7d10e97d31f0':
  Make test 146 run with secondary dex file in classpath.

Change-Id: I8f5f9615178d9184fa5ca692fd23408218783a80