tree de9fcc45fa23dbc9f815aed1ccb84f5128b4400a
parent 95275dc7caedda2e22524cae721dc13396ae15e4
parent f02a02c2150e9f80bb6a4ec2b5f388aa9693bc85
author Adam Lesinski <adamlesinski@google.com> 1438044403 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438044403 +0000

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

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