Merge branch 'development'
authorDaniel Martí <mvdan@mvdan.cc>
Fri, 10 Jan 2014 21:06:43 +0000 (22:06 +0100)
committerDaniel Martí <mvdan@mvdan.cc>
Fri, 10 Jan 2014 21:06:43 +0000 (22:06 +0100)
commit7c472c8e184529fb434abf3ba5b38e3b54e05cb5
tree1902a297e4763e05a1a33ee81f87edaac55f42a6
parent15c1b98d5c0ca678200e41b2d72e90adf93d51df
parentb9628a69609edf61ddf5155596227460ee48d229
Merge branch 'development'
AndroidManifest.xml
res/values/no_trans.xml