tree 2fc3b471bf8a23971a23a194977c3304e2597413
parent 562d456ba8a9a66c10c0ec6aa9e5c23dc44d104a
parent f8402ac03290e500b8f21bc0578bdbe61149ef1e
author The Android Open Source Project <initial-contribution@android.com> 1274205726 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1274205726 -0700

am f8402ac0: am 253290a7: merge from open-source master