tree b6b55fd347747cb1fde1d30b307c93db220d9663
parent cf7afdb28ea47ebe8a6b298a03cf89ba06ca333d
parent 8dd3de4c6b4f55f42095a20dce0b746f1f551e59
author Chih-hung Hsieh <chh@google.com> 1507577117 +0000
committer android-build-merger <android-build-merger@google.com> 1507577117 +0000

Merge "Use -Werror in external/mtpd" am: e6baa7634b
am: 8dd3de4c6b

Change-Id: I3ff7551dafbb3548ee511e2cc1fc55791cede87f