Alan Viverette 607ea331eb am 812b6426: Merge "Fix caption rendering" into klp-dev ...

* commit '812b64264176cb8a253a8253074bc9595503d2ac':
  Fix caption rendering

2013-09-25 15:23:50 -07:00

..

java

am 812b6426: Merge "Fix caption rendering" into klp-dev

2013-09-25 15:23:50 -07:00

jni

am 5db1f5aa: Merge "Fix Java API error where requesting another style for a provided family fails" into klp-dev

2013-09-23 18:59:24 -07:00

res

Import translations. DO NOT MERGE

2013-09-25 09:06:40 -07:00

tests

Merge "Update the Connectivity Manager test suit to use InstrumentationTestCase." into klp-dev

2013-09-16 21:11:31 +00:00