Merge commit 'b172b1a5b041394cfdfc11bdadb10ef051f86c08' into eclair * commit 'b172b1a5b041394cfdfc11bdadb10ef051f86c08': ADT Export wizard now calls ZipAlign
Merge commit 'b172b1a5b041394cfdfc11bdadb10ef051f86c08' into eclair * commit 'b172b1a5b041394cfdfc11bdadb10ef051f86c08': ADT Export wizard now calls ZipAlign