am 1b986cc4: Merge "Fix a bug with manual pick then dotcom key"

* commit '1b986cc488e7fb238c88b8cfe8e57bdbd494e56f':
  Fix a bug with manual pick then dotcom key
tree: e2717a7656e0c141f53ee2f83582407c22c192ed
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk