am f6cf387e: Merge "Recursively resolve @string/resource reference in key key spec parsing"

* commit 'f6cf387edc5e70dd578790c2625c50ed00a5dbf0':
  Recursively resolve @string/resource reference in key key spec parsing
tree: 733734977c83a0153fca5ea4308696af5fd43c2a
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk