762b2f2129a215bc851e73887244c3a82a892731 - fp2-dev/platform/external/chromium_org

commit	762b2f2129a215bc851e73887244c3a82a892731	[log] [tgz]
author	Torne (Richard Coles) <torne@google.com>	Wed Oct 02 12:40:43 2013 +0100
committer	Torne (Richard Coles) <torne@google.com>	Wed Oct 02 12:40:43 2013 +0100
tree	dd2f54198774af3566a11071ce0e90ad2f7f9f67
parent	331ba8b17b62dfe7ec9544bbfc1203a2ba03c0c3 [diff]

Merge from Chromium at DEPS revision 30.0.1599.85

This commit was generated by merge_to_master.py.

Change-Id: Ia939b5ad3e3e3d32216275d1f1c4ea7407440e37

build/util/LASTCHANGE[diff]
build/util/LASTCHANGE.blink[diff]
chrome/VERSION[diff]
chrome/browser/chromeos/extensions/external_cache.cc[diff]
chrome/browser/chromeos/login/login_utils.cc[diff]
chrome/browser/chromeos/login/oauth2_login_manager.cc[diff]
chrome/browser/chromeos/login/oauth_login_manager.h[diff]
chrome/browser/resources/quick_office/manifest_editor.json[diff]
chrome/browser/resources/quick_office/manifest_viewing.json[diff]
content/public/android/java/src/org/chromium/content/browser/input/MonthPicker.java[diff]
content/public/android/java/src/org/chromium/content/browser/input/TwoFieldDatePicker.java[diff]
content/public/android/java/src/org/chromium/content/browser/input/WeekPicker.java[diff]
remoting/remoting.gyp[diff]
remoting/webapp/all_js_load.gtestjs[diff]
remoting/webapp/cs_oauth2_trampoline.js[diff]
remoting/webapp/jscompiler_hacks.js[diff]
remoting/webapp/oauth2.js[diff]
remoting/webapp/oauth2_callback.html[Deleted - diff]
remoting/webapp/oauth2_callback.js[Deleted - diff]

19 files changed