aboutsummaryrefslogtreecommitdiffstats
path: root/README.android
diff options
context:
space:
mode:
authorStephen Hines <srhines@google.com>2012-08-22 17:56:25 -0700
committerStephen Hines <srhines@google.com>2012-08-23 19:15:15 -0700
commitd62cdbe700ab288e9ad447824066edb7d17167d9 (patch)
tree6447bcda49256a30c9eb7f740d16a5179624e3dd /README.android
parent31675153bd2d7617db8cb6aeb58054934c7b9f73 (diff)
downloadexternal_llvm-d62cdbe700ab288e9ad447824066edb7d17167d9.zip
external_llvm-d62cdbe700ab288e9ad447824066edb7d17167d9.tar.gz
external_llvm-d62cdbe700ab288e9ad447824066edb7d17167d9.tar.bz2
Add new files for Mips + fixups for merge to upstream r162314.
Change-Id: Ib545c0c991575c14b0b74e3b8fd4cc8c789b25d0
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 506df78..fc1ccbb 100644
--- a/README.android
+++ b/README.android
@@ -19,8 +19,9 @@
* For Ice Cream Sandwich MR1: Synced to upstream r142530
* For Ice Cream Sandwich MR2: Synced to upstream r146714
* For Jellybean: Synced to upstream r155090
-* For Jellybean MR1: Synced to upstream r160668
+* For Jellybean MR1: Synced to upstream r162314
+* Recent downstreaming on 2012/8/23: Synced to r162314 (Contact srhines for merge questions.)
* Recent downstreaming on 2012/8/3: Synced to r160668 (Contact sliao for merge questions.)
* Cherry-pick on 2012/05/23: https://llvm.org/svn/llvm-project/llvm/trunk@157317 (Contact srhines for merge questions.)
* Recent downstreaming on 2012/4/24: Synced to r155090 (Contact sliao for merge questions.)