tree 2ad1311afd86a992b5c692a579969b4c7d162af9
parent ebe6c85e59ba78effc63e404c78215300b92954f
parent ee0a864a84babe4eddf00e70f1a5d6ac9e3a86c2
author Brian Muramatsu <btmura@android.com> 1288996125 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1288996125 -0700

am ee0a864a: am 300712ec: Merge "Improve SystemFeaturesTest#testCameraFeatures" into froyo

* commit 'ee0a864a84babe4eddf00e70f1a5d6ac9e3a86c2':
  Improve SystemFeaturesTest#testCameraFeatures