aboutsummaryrefslogtreecommitdiffstats
path: root/README.android
diff options
context:
space:
mode:
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.)