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

This commit is contained in:
Joe Fernandez
2012-06-25 15:58:47 -07:00
committed by Android (Google) Code Review