Merge "ResearchLog uploadingService now waits for logging to finish" into jb-mr1-dev
tree: 3876e71f4e219000ac6fb9ea7f6ddbbaa293e76d
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk