tree e40cc3661934787db737fffd10ef61328cbc2060
parent eeac09e110f5c60a3ad1843db4bffef3242c601d
parent ecfb9a27819cbfef804d093c2f0fecc3de9d8252
author Chih-Hung Hsieh <chh@google.com> 1506541507 +0000
committer android-build-merger <android-build-merger@google.com> 1506541507 +0000

Merge "Use -Werror in external/bzip2" am: a0df5d74ad am: 0d71f00a5f am: 5c2c573231
am: ecfb9a2781

Change-Id: I3488f2c3fc53d9ba338ec2ec0a76015264c1c4b8