| commit | f2dcd20ea607d82b6c3de4bb3c8f3126b98732c3 | [log] [tgz] |
|---|---|---|
| author | Shih-wei Liao <sliao@google.com> | Mon Mar 26 23:56:49 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 26 23:56:49 2012 -0700 |
| tree | 293b77c523cd881642524704ed2fc70070259337 | |
| parent | 1e8872e82e6b8db86d51bb9dd2d347902b871118 [diff] | |
| parent | 6e41d42f6b7977325a87a125c344c1c9cdf6c949 [diff] |
am 6e41d42f: (-s ours) DO NOT MERGE: Cope with current LLVM in this branch. * commit '6e41d42f6b7977325a87a125c344c1c9cdf6c949': DO NOT MERGE: Cope with current LLVM in this branch.