From 6d9086ad636a2e4117ef1ae7b9cd2d1483b40289 Mon Sep 17 00:00:00 2001 From: Shih-wei Liao Date: Thu, 21 Jul 2011 06:49:09 -0700 Subject: Versioning. Change-Id: Iaeba647158c81da7e3f05ee222d508e0b07be983 --- README.android | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'README.android') 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: -- cgit v1.1