am 20622a8f: Merge "Fix bug 2557891 - incorrect cts test." into froyo

Merge commit '20622a8f2a2a29d2ff81e02aa28c0cf37b34ea56' into kraken

* commit '20622a8f2a2a29d2ff81e02aa28c0cf37b34ea56':
  Fix bug 2557891 - incorrect cts test.
tree: 74ae5b2b1578d9382bbf80f678a2b2b27b9370e6
  1. tests/
  2. tools/
  3. .gitignore
  4. Android.mk
  5. CleanSpec.mk