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

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

Change-Id: Ibdf85422ce17f3b179d60f20d422893568381a5c