Merge branch 'android-ticktimer' into android-test-plugins
commit694366d2e66fe8c8e94e092585222f7674635634
authorThomas Martitz <thomas.martitz@student.htw-berlin.de>
Fri, 10 Dec 2010 12:15:47 +0000 (10 13:15 +0100)
committerThomas Martitz <thomas.martitz@student.htw-berlin.de>
Fri, 10 Dec 2010 12:15:47 +0000 (10 13:15 +0100)
tree7ebdbfa8964d93687edf164297701df701abafd8
parent4b0cb49ee9a908de36e9ac19a60005550c3cb4b7
parent1681caf13b08ad049131fdee8f23d76c68f56bbd
Merge branch 'android-ticktimer' into android-test-plugins