tree c5ad3ec1fb20e23d326c43d25a2ffc70b1e8ce09
parent 355b7d647546e5614214dce549ac4c59bad7f0e2
parent af401c1a60d61122d6f542aa32ad79c500da33bd
author David 'Digit' Turner <digit@google.com> 1402435685 +0000
committer android-build-merger <android-build-merger@google.com> 1402435685 +0000

Merge "Remove hideous warnings with clang-based builds." into idea133
automerge: af401c1

* commit 'af401c1a60d61122d6f542aa32ad79c500da33bd':
  Remove hideous warnings with clang-based builds.