tree c9263884328b6651db6a6908c1a866f0a32d2ee9
parent 02f01fedc5180d1d5a795674f8c5bd0a3ce974d2
author Shih-wei Liao <sliao@google.com> 1332830582 -0700
committer Shih-wei Liao <sliao@google.com> 1332830582 -0700

DO NOT MERGE: Cope with current LLVM in this branch.

Change-Id: Id3dbfb96919bf1dd0e93d45ab18d0e4a06a08b72