git.saurik.com Git - android/aapt.git/commit

]> git.saurik.com Git - android/aapt.git/commit

author	Xavier Ducrohet <xav@android.com>
	Wed, 20 Jul 2011 23:31:25 +0000 (16:31 -0700)
committer	Xavier Ducrohet <xav@android.com>
	Wed, 20 Jul 2011 23:31:25 +0000 (16:31 -0700)
commit	82cf0eaeddd1f87bf54db24d3f84856a679e53a4
tree	e084441023c0f210a0c59f54b466dae8f3de8e80	tree \| snapshot
parent	4bb85b9ff958cc4bcd44f1a0c15cfda652109b80	commit \| diff
parent	b5a473dad502a67a09d3978b455dc4cbfafcc920	commit \| diff

resolved conflicts for merge of 2c311be7 to honeycomb-plus-aosp

Change-Id: I806c7b4ae95f66df621587e52497dd8739a115fe

mirror of aapt