Merge "Support a syntax to add whitelist entries in shortcuts" into jb-mr1-dev
tree: 754279bc825646e1209e6242490cdbae6479480f
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk