| commit | 1fc9af7705b400b84bf123b4c14bbb8aaaa4f396 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 17:37:19 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 17:37:19 2015 +0000 |
| tree | 156318d1e7602a679e0bb7d9834512a17995ea14 | |
| parent | 66940fb01eba429361178c3e60a6230a97d19b5c [diff] | |
| parent | 93193ccf436cb6592de1e9bca5476d6a5278ca48 [diff] |
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 '93193ccf436cb6592de1e9bca5476d6a5278ca48': Import translations. DO NOT MERGE