am 7cb1b82f: am 1181c5ac: Merge "Fix to follow the field naming conventions."

* commit '7cb1b82fe5fcb0952b85c5f5f1a8f58b15a64d90':
tree: babf61f77d189fad939c6643594f00f5951254fe
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk