am e2106796: Reconcile with jb-release

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