tree 1928693a14857dfd417bdb82115660e25dd6fe59
parent 06fb3122758d5e9200ea7aa0560a39bb3db7597e
parent 8ca4df28c5f8034f90984c14caea2b74f0e64910
author Aurimas Liutikas <aurimas@google.com> 1477612071 +0000
committer android-build-merger <android-build-merger@google.com> 1477612071 +0000

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

Change-Id: Ie58fbffc4818d693e87214add20daa5be558ed84