Narayan Kamath d62196cfef am 3fa99ec7: Merge "Remove bogus 2 char limit for locales and countries." ...

* commit '3fa99ec77ee52164575375c7709923c94d9693a6':
  Remove bogus 2 char limit for locales and countries.

2014-07-02 08:49:04 +00:00

..

java

am 989ab6d3: Merge "Update javadoc for android.os.Bundle."

2014-06-24 10:08:52 +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