tree f970f4cea57ff437740303b7c337d7ef2ab15ce2
parent bccc5b549b8cfa272d5e01a5e680d48ea66978ca
parent 053ff0e674087e6320fbb961f384b9fe6d2c6949
author Owen Lin <owenlin@google.com> 1256230218 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1256230218 -0700

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

Merge commit '053ff0e674087e6320fbb961f384b9fe6d2c6949'

* commit '053ff0e674087e6320fbb961f384b9fe6d2c6949':
  Add OVERRIDE_PACKAGES support for prebuild modules.