]> git.saurik.com Git - android/aapt.git/commitdiff
am 39b58ba2: resolved conflicts for merge of bc2fb7b9 to jb-dev-plus-aosp
authorJean-Baptiste Queru <jbq@google.com>
Tue, 1 May 2012 16:58:21 +0000 (09:58 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 1 May 2012 16:58:21 +0000 (09:58 -0700)
* commit '39b58ba2b299e1c97e13535aae9add530d942c7b':
  Build overlay packages just like regular packages.


Trivial merge