]> git.saurik.com Git - android/aapt.git/commitdiff
resolved conflicts for merge of bc2fb7b9 to jb-dev-plus-aosp
authorJean-Baptiste Queru <jbq@google.com>
Tue, 1 May 2012 16:53:48 +0000 (09:53 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Tue, 1 May 2012 16:54:38 +0000 (09:54 -0700)
Change-Id: I5386585e473201268c6ed8b05e0a16569d434ea2


No differences found