tree caa0a5b4d049b67b123459cf21887d14697890a3
parent c4d7721cb08cc797ea592f54797135f372689f6a
parent fcd7cf2a24eaff85085fde58dc8c69f8ff374575
author Joe Fernandez <joefernandez@google.com> 1340665243 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1340665243 -0700

am fcd7cf2a: Merge "cherrypick from ics-mr1: fixed custom-view zip file - Change-Id: Iaa6273846c4b132723f4574925a0db107f3cda7f" into jb-dev

* commit 'fcd7cf2a24eaff85085fde58dc8c69f8ff374575':
  cherrypick from ics-mr1: fixed custom-view zip file - Change-Id: Iaa6273846c4b132723f4574925a0db107f3cda7f