Marco Nelissen 7ffbcb2892 am ca5d99ac: Merge "Guarantee that all db related files are deleted together." ...

* commit 'ca5d99ac41f00c282b9101d9b84da0338f15798e':
  Guarantee that all db related files are deleted together.

2013-08-07 08:34:17 -07:00

..

java

am ca5d99ac: Merge "Guarantee that all db related files are deleted together."

2013-08-07 08:34:17 -07:00

jni

Revert "be more robust with handling unknown sensors"

2013-08-02 17:31:54 -07:00

res

am 8cf1f446: Merge "fix typo: Remove dulplicated comment line"

2013-07-30 11:45:25 -07:00

tests

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

2013-06-28 16:50:13 -07:00