Merge "Merge "AAPT: ProGuard config for components in main dex." into nyc-dev...
Merge "Merge "AAPT: ProGuard config for components in main dex." into nyc-dev am: ab456641 am: 341b4d07" into nyc-mr1-dev-plus-aosp
am: 1bed6311
* commit '1bed6311':
Change-Id: I60e7055a7167af0c5a4db18b3a24ca77bdf5ec91