]> git.saurik.com Git - android/aapt.git/commitdiff
resolved conflicts for merge of dd52dfed to jb-mr1.1-ub-dev
authorXavier Ducrohet <xav@android.com>
Tue, 15 Jan 2013 22:24:56 +0000 (14:24 -0800)
committerXavier Ducrohet <xav@android.com>
Tue, 15 Jan 2013 22:24:56 +0000 (14:24 -0800)
Change-Id: I839981af97e54c39f0ea0b8141a4dd02959263a0


No differences found