tree 4b825dc642cb6eb9a060e54bf8d69288fbee4904
parent fdd024443d4756c785e1d5fd9b5560a42cdc1f15
parent 517c044fe82e37bd6fa5d5cfd1c69ecdeb4be7e0
author Ying Wang <wangying@google.com> 1294434187 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1294434187 -0800

am 102b7bc9: Merge "TARGET_PRELINK_MODULE should not be modified in module\'s definition" into gingerbread

* commit '102b7bc9eba929d763c60c5c7467d2f9a529bf66':
  TARGET_PRELINK_MODULE should not be modified in module's definition