]> git.saurik.com Git - android/aapt.git/commitdiff
Reconcile with jb-mr0-release jb-release
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 30 Jul 2012 21:43:53 +0000 (14:43 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 30 Jul 2012 21:43:53 +0000 (14:43 -0700)
Change-Id: I241c11b89af86b312a9112a0004efb3ab6aaa3f6


Trivial merge