summaryrefslogtreecommitdiffstats
path: root/third_party
diff options
context:
space:
mode:
authorkochi@chromium.org <kochi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-26 04:34:38 +0000
committerkochi@chromium.org <kochi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-26 04:34:38 +0000
commit122a506e71c0917306ba3f5f92882691ed005071 (patch)
tree48d9d416d68b8dcbaad352e9886221ee387ba8d0 /third_party
parentad50e8b3bba31d489c91202f6709f80510108b6e (diff)
downloadchromium_src-122a506e71c0917306ba3f5f92882691ed005071.zip
chromium_src-122a506e71c0917306ba3f5f92882691ed005071.tar.gz
chromium_src-122a506e71c0917306ba3f5f92882691ed005071.tar.bz2
Roll third_party/cacheinvalidation from r221:r242.
The intention of this roll is to add 2 source types in proto (COSMO_CHANGELOG and CHROME_PUSH_MESSAGING), but also includes the v2 of the Android client library. r241 had an Android build issue (a symbol "ANDROID" was defined as an enum member in proto, which was blown away by -DANDROID compiler option, introduced at r239), and r242 reverted it. BUG=150005, 157546 TEST=compile succeeds. Review URL: https://codereview.chromium.org/11194078 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@164259 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
-rw-r--r--third_party/cacheinvalidation/README.chromium2
1 files changed, 1 insertions, 1 deletions
diff --git a/third_party/cacheinvalidation/README.chromium b/third_party/cacheinvalidation/README.chromium
index ad5d645..1014695 100644
--- a/third_party/cacheinvalidation/README.chromium
+++ b/third_party/cacheinvalidation/README.chromium
@@ -1,7 +1,7 @@
Name: Google Cache Invalidation API
Short Name: google-cache-invalidation-api
URL: http://code.google.com/p/google-cache-invalidation-api/
-Version: r220
+Version: r242
License: Apache 2.0
License File: src/google/cacheinvalidation/COPYING
Security Critical: no