OSDN Git Service

resolve merge conflicts of 1e92cfb to stage-aosp-master
authorColin Cross <ccross@android.com>
Fri, 15 Jul 2016 21:49:45 +0000 (14:49 -0700)
committerColin Cross <ccross@android.com>
Fri, 15 Jul 2016 21:49:45 +0000 (14:49 -0700)
commit4cca8a5573fc3463011c1d937bf27d3f756fcbf9
treefa7c573dbe153c636d105293a7184cdba22bd210
parent59c0529d6d0e68d1b267dcea6ab470fbf29774f3
parent1e92cfb9a0a23f54413825d663d004d36008e34e
resolve merge conflicts of 1e92cfb to stage-aosp-master

Change-Id: I1929d5c16ea0b8574372049ac7dffd30fd3e1db3
core/base_rules.mk
core/clear_vars.mk
core/definitions.mk