Narayan Kamath 3fa99ec77e Merge "Remove bogus 2 char limit for locales and countries."

2014-07-01 17:52:00 +00:00

..

java

Merge "Update javadoc for android.os.Bundle."

2014-06-24 06:22:45 +00:00

jni

Merge "Remove bogus 2 char limit for locales and countries."

2014-07-01 17:52:00 +00:00

res

Import translations. DO NOT MERGE

2014-03-24 09:46:08 -07:00

tests

Merge commit '0b62467b142b61ee1e449ba958ba37dfd961ef56' into HEAD

2014-04-29 16:07:29 -07:00