Eric Fischer 403f16ae0b Merge changes I40bfa0f8,I9fe6a999 ...

* changes:
  Restore deleted string still referenced from AndroidManifest.
  Import revised translations.

2010-11-10 10:26:08 -08:00

..

config

…

java

Merge "Correctly parse cookies with spaces after = in attributes"

2010-11-10 08:52:33 -08:00

jni

am cc798d96: am 2e2983c6: Merge "Reduce log clutter." into gingerbread

2010-11-09 07:06:02 -08:00

res

Merge changes I40bfa0f8,I9fe6a999

2010-11-10 10:26:08 -08:00

tests

Merge "Test to demonstrate that HTTP cookie hostnames aren't case-sensitive."

2010-11-09 10:25:04 -08:00