tree 82a4f883657e81d3ded5240d83ba4b063f275953
parent 4f0247878849011798a597886ceb9d8652cd4942
parent 138292c5daade20f699e167cad786fe3f1ced282
author Brian Muramatsu <btmura@android.com> 1292024910 -0800
committer Android Code Review <code-review@android.com> 1292024910 -0800

Merge "fixing non-telephony device test failures" into froyo