OSDN Git Service

Merge ""#warning" conflict with -Werror"
authorZhiquan Liu <zhiquan.liu@intel.com>
Thu, 3 Mar 2016 15:41:49 +0000 (15:41 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 3 Mar 2016 15:41:49 +0000 (15:41 +0000)
commit7dbaaf19eb3c2abde55a7082a2bfcea059dc8b72
treeef380d9bc8834e28bb26dc7ea82dd8cd9c4826a7
parent0e93732cf1b32fb001d4e99e6f49b97aab91a247
parente6b6843c5fc19976677706518c4875a78cc736bb
Merge ""#warning" conflict with -Werror"
am: e6b6843c5f

* commit 'e6b6843c5fc19976677706518c4875a78cc736bb':
  "#warning" conflict with -Werror