am 00e02489: Merge "Fix unit test for If8c94ef91ed58bb5028f51be7c8d9beb677436a4"

* commit '00e0248984c4fca912c59568eb6c394bf9530b73':
  Fix unit test for If8c94ef91ed58bb5028f51be7c8d9beb677436a4
tree: 0d4ecabe0a77a964e18779a69ecd3fe63e5b4894
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk