tree f02caa6cc78e1135b3e244b04f806a709b7d63f2
parent 495b0b37b4ecd736d9e4e15dfc44ff3cfdc2ed53
parent 39f767da28da1bd31957a586f63b937d6f0ccdc6
author Chih-Hung Hsieh <chh@google.com> 1506720790 +0000
committer android-build-merger <android-build-merger@google.com> 1506720790 +0000

Merge "Use -Werror in external/scrypt" am: bcc2d0c8ec am: 1ef1ce7c0e am: 9b1807ba4f
am: 39f767da28

Change-Id: I567257ab15938696a937de62a3d190d37a12f1c8