tree eb8f910c8320dffbf8060d638e7d3e5611776136
parent 089f65ed1e635b96f341562c78e86e43f20211a5
parent fd44b56d599bc6c6e7397dcdfaa6d613805a88cb
author Adam Lesinski <adamlesinski@google.com> 1438043746 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438043746 +0000

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

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