tree 5201c46422cdec7e56b659ba4d7712bbcf07c1a6
parent 0c2ddec42fc55af088bc50d97d8dce3ccfc5bbfb
parent 6737bf09bddb4404a9294a1c11621ff17cd7104a
author Tsu Chiang Chuang <tsu@google.com> 1301331022 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1301331022 -0700

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

* commit '6737bf09bddb4404a9294a1c11621ff17cd7104a':
  Extending cts test creation timeout and fix compile error.