aboutsummaryrefslogtreecommitdiffstats
path: root/README.android
diff options
context:
space:
mode:
Diffstat (limited to 'README.android')
-rw-r--r--README.android9
1 files changed, 5 insertions, 4 deletions
diff --git a/README.android b/README.android
index c50f0a8..6685c64 100644
--- a/README.android
+++ b/README.android
@@ -15,11 +15,12 @@
* For Honeycomb: Synced to upstream r112344.
* For Honeycomb MR1: Synced to upstream r119309
* For Honeycomb MR2: Synced to upstream r119309
-* For Ice Cream Sandwich: Synced to upstream r135360
+* For Ice Cream Sandwich: Synced to upstream r135568
-* Recent downstreaming on 2011/7/19: From r134306 to 135360 (Contact sliao@ for merge questions.)
-* Recent downstreaming on 2011/7/2: From r133718 to 134306 (Contact sliao@ for merge questions.)
-* Recent downstreaming on 2011/6/30: From r133240 to 133718 (Contact sliao@ for merge questions.)
+* Recent downstreaming on 2011/7/21: From r135360 to 135568 (Contact sliao & Logan for merge questions.)
+* Recent downstreaming on 2011/7/19: From r134306 to 135360 (Contact sliao for merge questions.)
+* Recent downstreaming on 2011/7/2: From r133718 to 134306 (Contact sliao for merge questions.)
+* Recent downstreaming on 2011/6/30: From r133240 to 133718 (Contact sliao for merge questions.)
* This downstreaming could have broken bitcode compatibility
* Upstream was migrating from 2.7 bitcode to 3.0 bitcode.
* See the 4 commits on 2011/6/17: