OSDN Git Service

resolved conflicts for 9073a5d9 to stage-aosp-master
authorStephen Hines <srhines@google.com>
Thu, 1 Oct 2015 05:32:05 +0000 (22:32 -0700)
committerStephen Hines <srhines@google.com>
Thu, 1 Oct 2015 05:32:05 +0000 (22:32 -0700)
commitba2355c9810ad3113e0705d106b28d9cdcbee759
tree837b6f7cb749d202dbf259bbd3f0812062ca8d2a
parentce9635ec7ad6bcc6b9bc74136edb91847fe9e4ff
parent9073a5d9a51020c0bbbb11c1f5c1b519ecfc544f
resolved conflicts for 9073a5d9 to stage-aosp-master

Change-Id: I9b048cb5fe70215a67ef025e8c7ef6aad86cffb3
core/config.mk