| commit | debee3942cffdcd6875b097986dffae3566cc18b | [log] [tgz] |
|---|---|---|
| author | Joe Fernandez <joefernandez@google.com> | Mon Jun 25 16:03:30 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 25 16:03:30 2012 -0700 |
| tree | ce77cc45a4e00b508affb3b280d9dc6c3182a1b4 | |
| parent | 85a2d7f94e2a92f2563d6dbba7216bc0a86dca1a [diff] | |
| parent | fb739ae7491a3abd4feecf2fac43a900b4f05850 [diff] |
am fb739ae7: am fcd7cf2a: Merge "cherrypick from ics-mr1: fixed custom-view zip file - Change-Id: Iaa6273846c4b132723f4574925a0db107f3cda7f" into jb-dev * commit 'fb739ae7491a3abd4feecf2fac43a900b4f05850': cherrypick from ics-mr1: fixed custom-view zip file - Change-Id: Iaa6273846c4b132723f4574925a0db107f3cda7f