]> git.saurik.com Git - android/aapt.git/commitdiff
projects / android / aapt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9c885e9 3b8452c)
Merge commit 'f479aa0900e9a85afdc78b1048684e37579ebf23'
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 21 May 2009 05:41:10 +0000 (22:41 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 21 May 2009 05:41:10 +0000 (22:41 -0700)
Conflicts:
api/current.xml
core/res/res/values/public.xml


Trivial merge
mirror of aapt