tree ef380d9bc8834e28bb26dc7ea82dd8cd9c4826a7
parent 0e93732cf1b32fb001d4e99e6f49b97aab91a247
parent e6b6843c5fc19976677706518c4875a78cc736bb
author Zhiquan Liu <zhiquan.liu@intel.com> 1457019709 +0000
committer android-build-merger <android-build-merger@google.com> 1457019709 +0000

Merge ""#warning" conflict with -Werror"
am: e6b6843c5f

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