]> git.saurik.com Git - android/aapt.git/commit
am 3e2d5914: resolved conflicts for merge of 13c04786 to jb-dev-plus-aosp
authorJean-Baptiste Queru <jbq@google.com>
Tue, 1 May 2012 17:10:30 +0000 (10:10 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 1 May 2012 17:10:30 +0000 (10:10 -0700)
commit3a5fd8665c0828bf31e69785ecfc685e1cc38f74
tree8140792f916236dead39a87d593e425a02ea92ce
parent13d17ba29811ac083084f1a2f0dc4c1510d04afb
parent49a9bf69364a9a501259785d47b9a4ac30e341eb
am 3e2d5914: resolved conflicts for merge of 13c04786 to jb-dev-plus-aosp

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