diff options
| author | Stephen Hines <srhines@google.com> | 2012-05-25 11:35:45 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-05-25 11:35:45 -0700 |
| commit | 0299b6d21dab59b0df48c857cb66d0b74877c5c0 (patch) | |
| tree | 157bf40fec3f1dd13f7c49ba219f6493c25595d2 | |
| parent | f04d010ec8be9ec5d3dc5e3bf302aeb1f7c57fa5 (diff) | |
| parent | 06b6c6b1ecad199b12f3198bfa7df0174bca0d82 (diff) | |
| download | external_llvm-0299b6d21dab59b0df48c857cb66d0b74877c5c0.zip external_llvm-0299b6d21dab59b0df48c857cb66d0b74877c5c0.tar.gz external_llvm-0299b6d21dab59b0df48c857cb66d0b74877c5c0.tar.bz2 | |
am 06b6c6b1: am 0aba94cf: Update for ASan cherry-pick.
* commit '06b6c6b1ecad199b12f3198bfa7df0174bca0d82':
Update for ASan cherry-pick.
| -rw-r--r-- | README.android | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/README.android b/README.android index c11cc80..b37bd55 100644 --- a/README.android +++ b/README.android @@ -20,6 +20,7 @@ * For Ice Cream Sandwich MR2: Synced to upstream r146714 * For Jellybean: Synced to upstream r155090 +* Cherry-pick on 2012/05/23: https://llvm.org/svn/llvm-project/llvm/trunk@157317 (Contact srhines for merge questions.) * Recent downstreaming on 2012/4/24: Synced to r155090 (Contact sliao for merge questions.) * Recent downstreaming on 2012/3/24: Synced to r153224 (Contact sliao & srhines for merge questions.) * Recent downstreaming on 2012/3/5: Synced to r152063 (Contact srhines & sliao for merge questions.) |