summaryrefslogtreecommitdiffstats
path: root/Source/WebCore
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-06-25 14:50:43 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-06-25 14:50:43 -0700
commit39a6582b61fce2deb8761ddf0096d206d6939bee (patch)
tree3b19a2b49ef2516999d3c87e0e234636baf4a2ad /Source/WebCore
parentd746a876b64cc47df56008cb5c55df37679ea2cd (diff)
parentff80940ae8358f49efbbb2d989b02e4b23dd1930 (diff)
downloadexternal_webkit-39a6582b61fce2deb8761ddf0096d206d6939bee.zip
external_webkit-39a6582b61fce2deb8761ddf0096d206d6939bee.tar.gz
external_webkit-39a6582b61fce2deb8761ddf0096d206d6939bee.tar.bz2
am ff80940a: resolved conflicts for merge of 343fe48a to jb-dev-plus-aosp
* commit 'ff80940ae8358f49efbbb2d989b02e4b23dd1930': Accept-Language header is not updated when phone language changes
Diffstat (limited to 'Source/WebCore')
0 files changed, 0 insertions, 0 deletions