]> git.saurik.com Git - android/aapt.git/commitdiff
projects / android / aapt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 13d17ba 49a9bf6)
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)
* commit '3e2d59146df9e9e325dcc65018bb130b03242bbc':
  Runtime resource overlay: clean-up.


Trivial merge
mirror of aapt