aboutsummaryrefslogtreecommitdiffstats
path: root/README.android
diff options
context:
space:
mode:
authorShih-wei Liao <sliao@google.com>2011-12-17 06:22:35 -0800
committerShih-wei Liao <sliao@google.com>2011-12-17 06:22:35 -0800
commitd010e1824491b73739b1a639b7e2805beeb71664 (patch)
treeeffc2e10aa97aa792642f1d02cb518f39518e91f /README.android
parent56837864265a27fdecc85c85f4c1cec73845cc94 (diff)
downloadexternal_llvm-d010e1824491b73739b1a639b7e2805beeb71664.zip
external_llvm-d010e1824491b73739b1a639b7e2805beeb71664.tar.gz
external_llvm-d010e1824491b73739b1a639b7e2805beeb71664.tar.bz2
Bookkeeping the downstreaming today that fixes an LLVM crash bug.
Change-Id: Ife17db11cc981dbd11b14c7b92ff0f31826d8a6c
Diffstat (limited to 'README.android')
-rw-r--r--README.android3
1 files changed, 2 insertions, 1 deletions
diff --git a/README.android b/README.android
index 4374509..7d50c75 100644
--- a/README.android
+++ b/README.android
@@ -17,8 +17,9 @@
* For Honeycomb MR2: Synced to upstream r119309
* For Ice Cream Sandwich: Synced to upstream r135569
* For Ice Cream Sandwich MR1: Synced to upstream r142530
-* For Ice Cream Sandwich MR2: Synced to upstream r145126
+* For Ice Cream Sandwich MR2: Synced to upstream r146714
+* Recent downstreaming on 2011/12/17: From r145126 to 146714 (Contact loganchien & sliao for merge questions.)
* Recent downstreaming on 2011/11/26: From r144606 to 145126 (Contact loganchien & sliao for merge questions.)
* Recent downstreaming on 2011/11/17: From r144354 to 144606 (Contact loganchien & sliao for merge questions.)
* Recent downstreaming on 2011/11/14: From r142530 to 144354 (Contact srhines for merge questions.)