tree 9253617bfd03b8a8115ead6dd2ed807612e1bf76
parent 105a934f3b1ce254c5db7c6740ea7c2bca6d2ea3
parent 95f862bcb0418fd931c574157a5c90312ea2fb77
author The Android Open Source Project <initial-contribution@android.com> 1273873037 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1273873037 -0700

am 95f862bc: merge from open-source master

Merge commit '95f862bcb0418fd931c574157a5c90312ea2fb77' into kraken

* commit '95f862bcb0418fd931c574157a5c90312ea2fb77':
  Fix "make modules" script bug under Mac OS X.