tree 7be6832bf627960b87d0e1acf221a8dea66651f5
parent d32ffc7e0661f6fa60ca3fe36acb14d2be953564
parent 104e3f238f500cacdb8afaccdc672dfc34eae7ee
author Chih-hung Hsieh <chh@google.com> 1418334166 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1418334166 +0000

Merge "Cleanups needed to make clang happy"