tree 73694aa3faa41b888c04a03e1e77ce96d0a7debd
parent b9ca09de7f80fa2e4321524e546f4e56377d178e
parent 21cc480363d2b08b7d46f2ed8bc08bdf115f5539
author Tsu Chiang Chuang <tsu@google.com> 1301330898 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1301330898 -0700

am 21cc4803: am bb447725: Extending cts test creation timeout and fix compile error.

* commit '21cc480363d2b08b7d46f2ed8bc08bdf115f5539':
  Extending cts test creation timeout and fix compile error.