tree c7fa41503b38ae8eb44726dfe172b82dac8d5d2f
parent 6e9b12760f910b9f78df654181114be7daec1539
parent 164eb050bdbaacb83e48a00c56b78d3c587a6e34
author Jake Hamby <jhamby@google.com> 1281970184 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1281970184 -0700

am 164eb050: am 4f170821: Merge "Fix typo and bug in CTS test class." into gingerbread

Merge commit '164eb050bdbaacb83e48a00c56b78d3c587a6e34'

* commit '164eb050bdbaacb83e48a00c56b78d3c587a6e34':
  Fix typo and bug in CTS test class.