am e1e94c7d: am fd44b56d: Merge "AAPT: Fix printing of resource configurations" into mnc-dev

* commit 'e1e94c7d58a176c3250438d4fdd35ef552cfe92a':
  AAPT: Fix printing of resource configurations