OSDN Git Service

Merge remote-tracking branch 'ygorigor/master'
authorKoushik Dutta <koushd@gmail.com>
Fri, 1 Mar 2013 21:14:17 +0000 (13:14 -0800)
committerKoushik Dutta <koushd@gmail.com>
Fri, 1 Mar 2013 21:14:17 +0000 (13:14 -0800)
commit8bc1037626b3fb0c90a202077947ad676c93471a
tree84b24d540ee3e56552cea4b854f0d5b6073f026e
parent5f0ba0e4377b223d066e505265e568a99b27a9ff
parenta5075c6189b8df463b82105cdf692260cf06041a
Merge remote-tracking branch 'ygorigor/master'

Conflicts:
Superuser/res/values-ro/strings.xml

Change-Id: I6003f793b3d5fb8531e866710da8f1dee07b715e
Superuser/res/values-ro/strings.xml