tree 1b8e2c77441850e5b97170181c3dc244c5d24f54
parent d601b8adace98814978ef519f8d5897d5d69c403
parent 1324107914b2873af028e76a647e5a8b98d3bda8
author Brian Muramatsu <btmura@android.com> 1312484391 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1312484391 -0700

am 13241079: am 4b9260f7: Merge "Merge remote branch \'korg/froyo\' into manualmerge" into gingerbread

* commit '1324107914b2873af028e76a647e5a8b98d3bda8':
  detect tab reuse
  Check Prefs and DB Values in AppSecurityTests
  CTS : modify "loadURL" method that wait until getProgress returns 100.
  Changed the condition to consider negative value for PID.