aboutsummaryrefslogtreecommitdiffstats
path: root/README.android
diff options
context:
space:
mode:
authorShih-wei Liao <sliao@google.com>2011-11-27 17:10:06 +0800
committerShih-wei Liao <sliao@google.com>2011-11-27 17:10:06 +0800
commitac212abcc6d858470ad35ce7d660af0c1800364a (patch)
tree385d729dceb9d7ed79c1eb1b941bbe73d6d16df9 /README.android
parent79f06f3cbcf2cb0394d33382186c31f2967cb400 (diff)
downloadexternal_llvm-ac212abcc6d858470ad35ce7d660af0c1800364a.zip
external_llvm-ac212abcc6d858470ad35ce7d660af0c1800364a.tar.gz
external_llvm-ac212abcc6d858470ad35ce7d660af0c1800364a.tar.bz2
Bookkeeping wrt downstreaming changes to fix miscompiles.
Also, merge in mips direct object emitter. Change-Id: I87444df6a23d90881f9da2993377953e00b55e16
Diffstat (limited to 'README.android')
-rw-r--r--README.android4
1 files changed, 3 insertions, 1 deletions
diff --git a/README.android b/README.android
index f617d5b..4374509 100644
--- a/README.android
+++ b/README.android
@@ -16,8 +16,10 @@
* For Honeycomb MR1: Synced to upstream r119309
* For Honeycomb MR2: Synced to upstream r119309
* For Ice Cream Sandwich: Synced to upstream r135569
-* For Ice Cream Sandwich MR1: Synced to upstream r144606
+* For Ice Cream Sandwich MR1: Synced to upstream r142530
+* For Ice Cream Sandwich MR2: Synced to upstream r145126
+* 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.)
* Recent downstreaming on 2011/10/22: From r135569 to 142530 (Contact sliao & logan for merge questions.)