am f97a56dc: am a6e803e9: Fix intermittent testZoom failure.

Merge commit 'f97a56dcb3add555b062f55de64dd304843fcc66' into kraken

* commit 'f97a56dcb3add555b062f55de64dd304843fcc66':
  Fix intermittent testZoom failure.
tree: da8f66a5cea2aa32e3aeb329167913dfcf0f5255
  1. tests/
  2. tools/
  3. .gitignore
  4. Android.mk
  5. CleanSpec.mk