aboutsummaryrefslogtreecommitdiffstats
path: root/README.android
diff options
context:
space:
mode:
authorStephen Hines <srhines@google.com>2012-05-23 14:32:15 -0700
committerStephen Hines <srhines@google.com>2012-05-23 14:32:15 -0700
commit0aba94cf61c78ed346c4fa20ca4aecf3edf82951 (patch)
tree5bdd45d4cdec6c12b0f9df2a9b7c3e9f35541785 /README.android
parent563c712a3905bd86b1c895ecddb528a810fd89b9 (diff)
downloadexternal_llvm-0aba94cf61c78ed346c4fa20ca4aecf3edf82951.zip
external_llvm-0aba94cf61c78ed346c4fa20ca4aecf3edf82951.tar.gz
external_llvm-0aba94cf61c78ed346c4fa20ca4aecf3edf82951.tar.bz2
Update for ASan cherry-pick.
Change-Id: I118326c38e912eb0626ee13b12798e87b1ad2add
Diffstat (limited to 'README.android')
-rw-r--r--README.android1
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.)