tree 8edc63b37f5002e6bfccbf80e9c1a800bfed3e32
parent e59de21b8af028929e5bb7c077f323ce8f19081b
parent 3ca0e96a3a66a6c53536bf7346f616e672e2c57a
author Dan Bornstein <danfuzz@android.com> 1273095444 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1273095444 -0700

am 3ca0e96a: Merge "Fixed a bunch of stuff in the prelink mappings file:" into froyo

Merge commit '3ca0e96a3a66a6c53536bf7346f616e672e2c57a' into froyo-plus-aosp

* commit '3ca0e96a3a66a6c53536bf7346f616e672e2c57a':
  Fixed a bunch of stuff in the prelink mappings file: