]> git.saurik.com Git - android/aapt.git/commit
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)
commit83c9c76327651abd9c134ceb1c49d2120d0caa0a
tree1d0fe2918c222419e76a898ff54adbeb64b4627e
parent9c885e91ecbae47dcae47f71fa0eea7e50793e22
parent3b8452c99ff2cf18f45476a813781f33471ff399
Merge commit 'f479aa0900e9a85afdc78b1048684e37579ebf23'

Conflicts:
api/current.xml
core/res/res/values/public.xml