Merge "Don't allow cancelling manual pick."
tree: 6b962b5d777eaedab231c1e873cda3ac2d8d1e0a
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk