aboutsummaryrefslogtreecommitdiffstats
path: root/README.android
diff options
context:
space:
mode:
authorShih-wei Liao <sliao@google.com>2011-07-19 07:38:15 -0700
committerShih-wei Liao <sliao@google.com>2011-07-19 07:38:15 -0700
commit46b77918fb8670fbc0a4a6389c5fa0795264c2cb (patch)
tree5c76c2caf266b3537e234bf777222e9daaad6ac9 /README.android
parentd1f93c9dc8458e07189a60c8d20953f028758037 (diff)
downloadexternal_llvm-46b77918fb8670fbc0a4a6389c5fa0795264c2cb.zip
external_llvm-46b77918fb8670fbc0a4a6389c5fa0795264c2cb.tar.gz
external_llvm-46b77918fb8670fbc0a4a6389c5fa0795264c2cb.tar.bz2
Documentation.
Change-Id: If03a12088ee8b85706e235ab03822659d78f904c
Diffstat (limited to 'README.android')
-rw-r--r--README.android12
1 files changed, 6 insertions, 6 deletions
diff --git a/README.android b/README.android
index 6ef6a5d..c50f0a8 100644
--- a/README.android
+++ b/README.android
@@ -17,9 +17,9 @@
* For Honeycomb MR2: Synced to upstream r119309
* For Ice Cream Sandwich: Synced to upstream r135360
-* Recent downstreaming on 2011/7/19: From r134306 to 135360
-* Recent downstreaming on 2011/7/2: From r133718 to 134306
-* Recent downstreaming on 2011/6/30: From r133240 to 133718
+* 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:
@@ -32,9 +32,9 @@
==> * 020a5a4 - remove bitcode reader support for LLVM 2.7 metadata encoding. (13 days ago) <Chris Lattner>
* We maintain compatibility because Honeycomb SDK is out there.
* Our bitcode reader can read both 2.7 and 3.0 versions. Writer is tracking upstream.
-* Recent downstreaming on 2011/6/22: From r129128 to 133240
-* Recent downstreaming on 2011/4/8: From r127116 to 129128
-* Recent downstreaming on 2011/3/11: From r119309 to 127116
+* Recent downstreaming on 2011/6/22: From r129128 to 133240 (Contact sliao@ for merge questions.)
+* Recent downstreaming on 2011/4/8: From r127116 to 129128 (Contact sliao@ for merge questions.)
+* Recent downstreaming on 2011/3/11: From r119309 to 127116 (Contact sliao@ for merge questions.)
* We add 40+ Android's *.mk files that are specific to Android's build system.