| commit | bda455726d1fceda85ee0e3ca87be7df78068f49 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 17:49:11 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 17:49:11 2015 +0000 |
| tree | a75be3fffb5383cd8a5b75e920a41da1ce73fc16 | |
| parent | 72e6f01eb11343c7a053b3486f48b6dc3ae68e4e [diff] | |
| parent | 66940fb01eba429361178c3e60a6230a97d19b5c [diff] |
am 66940fb0: (-s ours) am d534affc: (-s ours) am c9664084: (-s ours) am f72e1202: (-s ours) am 6aea6b9d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit '66940fb01eba429361178c3e60a6230a97d19b5c': Import translations. DO NOT MERGE