Merge branch 'android-notification' into android-test-plugins
commit529c8a3dbcd348f9a08894926e4188173e41c7d8
authorThomas Martitz <thomas.martitz@student.htw-berlin.de>
Wed, 24 Nov 2010 16:50:14 +0000 (24 17:50 +0100)
committerThomas Martitz <thomas.martitz@student.htw-berlin.de>
Wed, 24 Nov 2010 16:50:14 +0000 (24 17:50 +0100)
tree08c0fe139d13ecf16fdbb120224461c522bda6d2
parent7b72c7d87760d54ce6255f98c57fe9af28fa089c
parent67a04143bc97b703b74fbf811b38476a75e0787c
Merge branch 'android-notification' into android-test-plugins
apps/plugins/CATEGORIES
apps/plugins/test_codec.c
tools/configure