am 96d0e019: (-s ours) am 7d5fb3a9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

Browse Source

* commit '96d0e0194d43d3cdf04f39d5791160a91e0734bd':

main

Geoff Mendal 2015-08-27 11:28:38 +00:00 committed by Android Git Automerger

parent a74496734b 96d0e0194d

commit e9cc771dee

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 Expand all files Collapse all files

Diff Content Not Available