tree 8fe049da2df129554aa670fa70c4c9f89a5db27c
parent 8785c9f7c6f48b0e5e47c43d2e366ca2ecd83dc1
parent 95c8f2abd789b3004f9480ad17321bf9ccbb427b
author Chih-hung Hsieh <chh@google.com> 1507841555 +0000
committer android-build-merger <android-build-merger@google.com> 1507841555 +0000

Merge "Use -Werror in external/mksh" am: 9da7e0f318 am: b6be55d35e
am: 95c8f2abd7

Change-Id: Ie5178680bfee7a48257f365416f802e2b1566e32