OSDN Git Service

reconcile aosp (8689b90bcfdc92c94475901935b5f6efae0c9abc) after branching. Please...
authorEd Heyl <edheyl@google.com>
Tue, 15 Jul 2014 06:32:28 +0000 (23:32 -0700)
committerEd Heyl <edheyl@google.com>
Tue, 15 Jul 2014 06:32:28 +0000 (23:32 -0700)
commitf6771f631b814189d83b9b16cfa73d1466f932af
treeef17465cb774620b1fc8f1f40e925345ed2979e2
parent4f892ab728798dab39812e2dcf38bec5b2a112ea
reconcile aosp (8689b90bcfdc92c94475901935b5f6efae0c9abc) after branching. Please do not merge.

Change-Id: I0e4c55cc5a04d4593c3cd200c08c48d18c08a161
core/combo/TARGET_linux-x86.mk
core/combo/TARGET_linux-x86_64.mk