| commit | 3d9a36c555d8811f21a086d6496d754d02434730 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 17:49:13 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 17:49:13 2015 +0000 |
| tree | a75be3fffb5383cd8a5b75e920a41da1ce73fc16 | |
| parent | bda455726d1fceda85ee0e3ca87be7df78068f49 [diff] | |
| parent | 1fc9af7705b400b84bf123b4c14bbb8aaaa4f396 [diff] |
am 1fc9af77: (-s ours) am 93193ccf: (-s ours) am 896e619e: (-s ours) am ef1cb855: (-s ours) am 7d5fb3a9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit '1fc9af7705b400b84bf123b4c14bbb8aaaa4f396': Import translations. DO NOT MERGE