am 1cbfc6c9: DO NOT MERGE.  Follow up change to I8b38e280 Add visual indicator that long press / or @ on F1 key will bring up Settings

Merge commit '1cbfc6c968378f2e0a20b41677ec2a96bf69b621' into gingerbread-plus-aosp

* commit '1cbfc6c968378f2e0a20b41677ec2a96bf69b621':
  DO NOT MERGE.  Follow up change to I8b38e280
tree: a944bb92c2200f0228a03186c59a1308ec84c5d1
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. Android.mk
  6. CleanSpec.mk