OSDN Git Service

Merge remote-tracking branch 'jchleb/master'
authorKoushik Dutta <koushd@gmail.com>
Sat, 9 Mar 2013 03:18:08 +0000 (19:18 -0800)
committerKoushik Dutta <koushd@gmail.com>
Sat, 9 Mar 2013 03:18:08 +0000 (19:18 -0800)
commit1ef4a3ede4f6d41db645b165ce90e86a399bea63
tree2faf8c1709703fdf7531c88b91112a86fae2702f
parente2bf07c975115ff6f8b03d20ddafc5f5cb174e37
parentfa7318eaf3190faeb2cf42510a3c41376347b169
Merge remote-tracking branch 'jchleb/master'

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

Change-Id: I1b06a4d6a34d8422f71dbcf8d8d1c23837dd822e