From: Jean-Baptiste Queru <jbq@google.com>
Date: Tue, 1 May 2012 17:10:30 +0000 (-0700)
Subject: am 3e2d5914: resolved conflicts for merge of 13c04786 to jb-dev-plus-aosp
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/3a5fd8665c0828bf31e69785ecfc685e1cc38f74

am 3e2d5914: resolved conflicts for merge of 13c04786 to jb-dev-plus-aosp

* commit '3e2d59146df9e9e325dcc65018bb130b03242bbc':
  Runtime resource overlay: clean-up.
---

3a5fd8665c0828bf31e69785ecfc685e1cc38f74