Merge "Fix a race condition with shift" into jb-mr1-dev
tree: 2a9504d63748541cc7bd2dd1fe426f747a89beaf
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk