Baligh Uddin 45544136f5 Merge "Import translations. DO NOT MERGE"

2013-07-11 18:53:28 +00:00

..

java

Merge "Trace list view items management"

2013-07-11 18:19:24 +00:00

jni

Merge "be more robust with handling unknown sensors"

2013-07-08 22:48:37 +00:00

res

Import translations. DO NOT MERGE

2013-07-10 18:24:25 -07:00

tests

am b8292830: resolved conflicts for merge of a920f25f to jb-mr2-dev-plus-aosp

2013-06-28 16:53:27 -07:00