commit | ea4b1a8600e65d487af7528baa31deabb4db020a | [log] [tgz] |
---|---|---|
author | Dan Bornstein <danfuzz@android.com> | Wed May 05 14:39:24 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 05 14:39:24 2010 -0700 |
tree | a9c120204ea4758c0d8213fb957a7d6b71b9614d | |
parent | 2915cc3e323a9bf86e1a20b201ceb4e9529bc5a2 [diff] | |
parent | aed937ba46e4137ad5a5d047a438f48c4c81e46b [diff] |
am aed937ba: am 3ca0e96a: Merge "Fixed a bunch of stuff in the prelink mappings file:" into froyo Merge commit 'aed937ba46e4137ad5a5d047a438f48c4c81e46b' into kraken * commit 'aed937ba46e4137ad5a5d047a438f48c4c81e46b': Fixed a bunch of stuff in the prelink mappings file: