OSDN Git Service

Merge "Make test 146 run with secondary dex file in classpath."
authorAlex Light <allight@google.com>
Fri, 1 Apr 2016 18:54:51 +0000 (18:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 1 Apr 2016 18:54:51 +0000 (18:54 +0000)
commit233a587e41101dc8de96d1942fbf7d10e97d31f0
tree57195a6a05335cd9771b7fe6b485c2cc37e6054c
parentb5e196df1b95d25c46eeba173808d284ff0ed463
parent1669fe3219f295d14c43d5bd3b4e8d255e52be3f
Merge "Make test 146 run with secondary dex file in classpath."
am: 1669fe3

* commit '1669fe3219f295d14c43d5bd3b4e8d255e52be3f':
  Make test 146 run with secondary dex file in classpath.

Change-Id: I88392959b63c6303d6a8da967cb93a2cfaa14f8d