Merge remote-tracking branch 'remotes/upstream/master'

Browse Source

# Conflicts:
#	android/res/values/strings.xml

pull/9/head

Elad Keyshawn 10 years ago

parent a7c51d676a 489aadf271

commit 464106ad28

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File

Diff Content Not Available