Merge pull request #1188 from awakecoding/master
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Fri, 12 Apr 2013 22:30:14 +0000 (15:30 -0700)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Fri, 12 Apr 2013 22:30:14 +0000 (15:30 -0700)
commitb4b0fb06429b1ae2bae1429cc1a930509babf57e
tree25a7294b57ba8ef0d7c7f678440f44c1be9d8df0
parentedaf5073e316924096ecba33b7ac89f6f84afce3
parent073c6fb98374d805bea5f388506be8c3cc039e83
Merge pull request #1188 from awakecoding/master

Android Translation, LoadBalanceInfo, StreamPool