tree 36fee2660856de7bec3600d4ae398a5e4724d4de
parent 622512420652f1622a8d0ca9b64845e2a0288aa9
author Xavier Ducrohet <xav@android.com> 1334793295 -0700
committer Xavier Ducrohet <xav@android.com> 1334954633 -0700

Manifest merger in Ant build.

This merges the manifest of the libraries into the application's
manifest.

Change-Id: I425e7b75f71d3f50c6422cdb62bb5ec6811ce99d