tree f8aaa96c9e906023f7a6042699194f3329bbf84a
parent 68404a0125999ebe0d58c3eb1845b3c9aaf4d51e
parent f56aac4b6e169dc6e57aec6e94709e2425f34459
author Jeff Hamilton <jham@android.com> 1288120688 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1288120688 -0700

am f56aac4b: am d8cf2125: Merge "Add a way to get a string for an error code." into gingerbread