tree 1928693a14857dfd417bdb82115660e25dd6fe59
parent 06fb3122758d5e9200ea7aa0560a39bb3db7597e
parent 7424963b5b0ff668ccfa6d692a4b0d7e2896078a
author Aurimas Liutikas <aurimas@google.com> 1477611800 +0000
committer android-build-merger <android-build-merger@google.com> 1477611800 +0000

Merge "Fix all warnings and enable -Werror for gptfdisk." am: 2c054ab90e
am: 7424963b5b

Change-Id: Ib529d92396cc2c7ad482bd25e66f1adfc7f24b46