Raph Levien 7f374287c4 am 85e9092d: am 88ac4e04: Merge "Rename setTextDir to setTextDirection" into mnc-dev ...

* commit '85e9092decddc5a0da43ecbd22ef2d3292daca4d':
  Rename setTextDir to setTextDirection

2015-06-03 23:32:17 +00:00

..

java

am 85e9092d: am 88ac4e04: Merge "Rename setTextDir to setTextDirection" into mnc-dev

2015-06-03 23:32:17 +00:00

jni

am 1bd73625: am 1b54fb27: Delete MAKE_ENUM_FLAGS

2015-06-03 21:11:22 +00:00

res

Merge "Import translations. DO NOT MERGE" into mnc-dev

2015-06-03 19:47:36 +00:00

tests

Convert subtypes whose locale is "tl" to "fil".

2015-06-02 17:09:50 -07:00