tree b9cde8ea9dbd1f5a6e0c9284ee551d26fd2f91d7
parent 4744aa7918c4bdf68f49d81e411479fcd4d0ad13
parent 3aee1be35cb3dcb2677faaebe4b4cb139c87433b
author Brian Muramatsu <btmura@android.com> 1291262151 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1291262151 -0800

am 3aee1be3: am 369ed988: Merge "Temporary Fix for CTS Build" into froyo

* commit '3aee1be35cb3dcb2677faaebe4b4cb139c87433b':
  Temporary Fix for CTS Build