Lorenzo Colitti b6b9fe216d am 2f196e6c: Merge "Remove dead code, mostly DataStateTracker." ...

* commit '2f196e6c81e50b70d56c1cc06fd2aec147b58ed8':
  Remove dead code, mostly DataStateTracker.

2015-03-12 07:38:50 +00:00

..

java

am 2f196e6c: Merge "Remove dead code, mostly DataStateTracker."

2015-03-12 07:38:50 +00:00

jni

am 63d43949: Merge "Use the icu:: namespace for icu4c API."

2015-03-09 18:20:42 +00:00

res

am a98c21a6: Make circular mask thickness configurable

2015-03-11 17:24:54 +00:00

tests

resolved conflicts for merge of 517e0274 to lmp-mr1-dev-plus-aosp

2015-02-11 12:37:12 -08:00