OSDN Git Service

resolve merge conflicts of ff3341b to stage-aosp-master am: e6350dfddd
authorEvgenii Stepanov <eugenis@google.com>
Thu, 30 Jun 2016 23:58:11 +0000 (23:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 30 Jun 2016 23:58:11 +0000 (23:58 +0000)
commit539fef836543c46cf0abee46bfac4a2eda3ee9f4
tree1cbd46abd8e716be1999624b4406acc3fcef0678
parenta3e8e9c6f33ecd57221b7fe0ab1bf9c5035351ed
parent83ae8a4ca9cec88e8e4a464259976a7735e9df9c
resolve merge conflicts of ff3341b to stage-aosp-master am: e6350dfddd
am: 83ae8a4ca9

Change-Id: I5d8893e9da402aea5416e38a3b5c6ef9808d3b17
core/clear_vars.mk
core/config_sanitizers.mk