OSDN Git Service

resolved conflicts for 953981db to stage-aosp-master
authorColin Cross <ccross@android.com>
Tue, 29 Sep 2015 01:45:23 +0000 (18:45 -0700)
committerColin Cross <ccross@android.com>
Tue, 29 Sep 2015 01:45:23 +0000 (18:45 -0700)
commit7ee3b85eba08304cb9e396aaf52a77729f125532
tree86bbf69742b3539511a0797689d5b6e95dae0bc7
parent98da13bbd2db4b2247b90d83deec5e8befbee536
parent953981db624c23b0aab3906a06e3910622a8a01f
resolved conflicts for 953981db to stage-aosp-master

Change-Id: Ic1003a594ac5e5e91b124f249a569fb81123e973
core/binary.mk
core/definitions.mk
core/executable_prefer_symlink.mk
core/java.mk
core/prebuilt_internal.mk