tree 787c139e8380dd1ea4e120a7048d298d2f581c7d
parent baec2d25f6ce1a6a4a2cdf00a6ccbb3deca22bcc
parent 8e82180c83eb89069716fb790ed0f006e469be1c
author Josh Gao <jmgao@google.com> 1448396444 +0000
committer android-build-merger <android-build-merger@google.com> 1448396444 +0000

Merge changes I36b66fc5,I0561affb am: 166e716851
am: 8e82180c83

* commit '8e82180c83eb89069716fb790ed0f006e469be1c':
  libcutils: turn on -Werror on Win32, fix resulting build break.
  libcutils: add prefix to local variables in Android.mk.