tree af45eddba12da9304ccb1c90efd00d3776e66616
parent 6accf55bf36ff527059c0c4fc608388a5440f758
author Dan Albert <danalbert@google.com> 1431036736 -0700
committer Dan Albert <danalbert@google.com> 1431102954 -0700

Revert "Fix clang build."

Bug: http://b/20065774
This reverts commit 0975a5d9d29019e764dc0ab2ddc75759bebffb9b.

(cherry picked from commit 6f0d7005f9bc6d293e5cfcd60c13a6af0ffa99fc)