From: Ying Wang <wangying@google.com>
Date: Thu, 26 Apr 2012 01:53:49 +0000 (-0700)
Subject: Apply --extra-packages in case --custom-pacakge is also specified.
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/ec94a847fa1fe53d8f41500baec0a8f5980c9b8b?hp=ec94a847fa1fe53d8f41500baec0a8f5980c9b8b

Apply --extra-packages in case --custom-pacakge is also specified.

Cherry-picked from master.

Change-Id: I2d67b8821afdf064f4186ccd8def1b65f9a7dc88
---