diff options
| author | Paul Duffin <paulduffin@google.com> | 2015-08-07 20:08:11 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-07 20:08:11 +0000 |
| commit | 85a2e6cacfce1fe0d4c499637a9f30671dd545dc (patch) | |
| tree | b43c2764601cd90ad0b586aa21accbb60bed6098 | |
| parent | 95b321369ed8af3c5cf740313ad13ebdc1789541 (diff) | |
| parent | ff6b73223a89a3e70c41131aa117b749ff055c74 (diff) | |
| download | guava-85a2e6cacfce1fe0d4c499637a9f30671dd545dc.tar.gz | |
am ff6b7322: Merge "Update the contents of the README.android file to match the latest code"
* commit 'ff6b73223a89a3e70c41131aa117b749ff055c74':
Update the contents of the README.android file to match the latest code
| -rw-r--r-- | README.android | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/README.android b/README.android index ed30e5d1a..3464386c7 100644 --- a/README.android +++ b/README.android @@ -1,12 +1,12 @@ URL: http://code.google.com/p/guava-libraries/source/checkout -Version: v11.0.2 +Version: v18.0 License: Apache 2 -Description: "Guava: Google Core Libraries for Java 1.5" +Description: "Guava: Google Core Libraries for Java 1.7" -Local Modifications: - Commented out use of the non-public sun.misc.Unsafe - from guava/src/com/google/common/primitives/UnsignedBytes.java - Look for "BEGIN/END android-changed" markers. +Local Modifications: + Replace usages of Unsafe.compareAndSwap(Int|Long) in Striped64.java with Atomic(Integer|Long)FieldUpdater classes + Remove usages of Unsafe in UnsignedBytes.java and use standard Java + Add Closeables.closeQuietly(Closeable) back in temporarily until all usages are removed Guava-libraries are a grab bag of utility libraries published by Google as open source, including among other things the Google collections libraries. |