tree 8aab869221efd58c3f5787d9112089709f229ca0
parent 4f9f278341edff643540d0da5c6dd53ae92ee23c
parent 7fce15dc5e190859ceef8e6a46f3cd4133eb9c7d
author Dan Willemsen <dwillemsen@google.com> 1512083918 +0000
committer android-build-merger <android-build-merger@google.com> 1512083918 +0000

Merge "Fix warning from clang+mingw"
am: 7fce15dc5e

Change-Id: I1b318913c3ead77369bdb62c10e5e08803cb10b8