OSDN Git Service

resolve merge conflicts of 42c42b6971 to master.
authorYohann Roussel <yroussel@google.com>
Tue, 22 Dec 2015 14:36:32 +0000 (15:36 +0100)
committerYohann Roussel <yroussel@google.com>
Tue, 22 Dec 2015 14:36:32 +0000 (15:36 +0100)
commit4ef01c412a68274ab93c2a0292de5ac5894ee00c
treeaf2008c546adb7687b96d683dd8dac1ebb2db271
parent69942ee538b41df77515c027c8414b4e12d47878
parent42c42b69713998d851bbdc11d97b28590e3e3bde
resolve merge conflicts of 42c42b6971 to master.

Change-Id: I40e2d2f7cd3e047bc3bc661f20c7415ce751b321
core/host_dalvik_java_library.mk
core/host_dalvik_static_java_library.mk
core/java.mk
core/main.mk