Merge "Step 39-A Cleanup proximity_info_state" into jb-mr1-dev
tree: d17515b780c932aac613f9da32184e636d8b01cf
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk