Jeff Brown fa59cfbc85 resolved conflicts for merge of bce45617 to master ...

Change-Id: Ieb966e674dca3ec46cd3cd25e4de281f1be747c2

2011-10-31 15:10:10 -07:00

..

java

resolved conflicts for merge of bce45617 to master

2011-10-31 15:10:10 -07:00

jni

resolved conflicts for merge of 2d280f75 to ics-mr1

2011-10-30 14:24:02 -07:00

res

Import revised translations. DO NOT MERGE

2011-10-28 17:02:44 -07:00

tests

Interpret '+' as a space char in the URL query params.

2011-10-28 18:31:52 -04:00