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

* commit '68d982dab9ebba2accb7aa37f55cf68548d24818':
  AAPT: Fix printing of resource configurations