am d56d69b6: Merge "Fix dependency when switching between build variants with...
am d56d69b6: Merge "Fix dependency when switching between build variants with and without Proguard." into gingerbread
Merge commit 'd56d69b6' into gingerbread-plus-aosp
* commit 'd56d69b6':
Fix dependency when switching between build variants with and without Proguard.