am 468ecb95: fix failing test.

Merge commit '468ecb9591c35466d0a89b96d205da636a6f66a1' into eclair-plus-aosp

* commit '468ecb9591c35466d0a89b96d205da636a6f66a1':
  fix failing test.
tree: 7aea7b559099a4f01a121e2d53a438fdaccf4168
  1. android/
  2. dist/