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

* commit '3ab63f637f4ff4a6783bdd197734d67d605c453d':
  AAPT: Fix printing of resource configurations

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base