tree 73f72807777756659d412349b12d45266a3c504e
parent 8893c66d35a9e1691c8001817b1e9c33d2bf0a47
parent 166e716851a11f1c2280b211fe00017e1eb2c3b5
author Josh Gao <jmgao@google.com> 1448396250 +0000
committer android-build-merger <android-build-merger@google.com> 1448396250 +0000

Merge changes I36b66fc5,I0561affb
am: 166e716851

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