tree 1fc1f96a0775eacb827e2a5fcb209cbf087e3ad1
parent 21e91f357a45069eaa55542dc9f46d1293d1c21c
parent 355670b98584210502f96fe0446a854f07026c28
author Owen Lin <owenlin@google.com> 1256229213 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1256229213 -0700

am 355670b9: am 64d5a807: Add OVERRIDE_PACKAGES support for prebuild modules.

Merge commit '355670b98584210502f96fe0446a854f07026c28' into eclair-mr2-plus-aosp

* commit '355670b98584210502f96fe0446a854f07026c28':
  Add OVERRIDE_PACKAGES support for prebuild modules.