am 65ef2608: Merge "Fix a race condition with shift" into jb-mr1-dev

* commit '65ef26081b78f52960ad520f997b3e79dcbb8528':
  Fix a race condition with shift
tree: 2a9504d63748541cc7bd2dd1fe426f747a89beaf
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk