OSDN Git Service

resolved conflicts for merge of c0133a73 to lmp-mr1-dev-plus-aosp
authorDmitriy Ivanov <dimitry@google.com>
Thu, 2 Oct 2014 18:52:06 +0000 (11:52 -0700)
committerDmitriy Ivanov <dimitry@google.com>
Thu, 2 Oct 2014 18:59:28 +0000 (11:59 -0700)
commite3105fee224456000f84a03a767685849055e381
treee8e1c4d9ffbfac2cadc988927d0a487ec0e18c79
parentdaf15a6ca7b1ef7f16103e339334eda3b18aa425
parentc0133a73b6f37b88afc8dafb6f63af03cbb708f6
resolved conflicts for merge of c0133a73 to lmp-mr1-dev-plus-aosp

Change-Id: I31d81e91d796fa27f9c88a7edc96c97320ade72c
linker/linker.cpp
linker/linker.h
linker/linker_phdr.cpp
tests/Android.mk
tests/libs/Android.mk