tree 961bc5abb716152042b552acda49172f96508d7f
parent 716950a0c4d3fb65cf15bc85ed2dc6d4a275957b
parent 77c594a1b897d86a90bf0b17daa522350e4730a6
author Brian Muramatsu <btmura@android.com> 1297374785 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1297374785 -0800

am 77c594a1: am ef3f73f5: am 5a2cfdc6: Merge "Timing issue in CTS tc "testPermissionDiffCert"" into gingerbread

* commit '77c594a1b897d86a90bf0b17daa522350e4730a6':
  Timing issue in CTS tc "testPermissionDiffCert"