tree 0fb616cfa5f66dac91832ca4e3647ba30db7fac5
parent 74108deaf1747943a493751cbff9de321f1dd397
parent 7dfcfbc0d4f5d761cef026196035ae2f3019cbae
author Dan Bornstein <danfuzz@android.com> 1273095364 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1273095364 -0700

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