| commit | 93193ccf436cb6592de1e9bca5476d6a5278ca48 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 17:17:46 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 17:17:46 2015 +0000 |
| tree | 156318d1e7602a679e0bb7d9834512a17995ea14 | |
| parent | d534affcdb2ebaf497111ccc8c86bdc4d4f67282 [diff] | |
| parent | 896e619e52c8d01317d56f458f3bc7a9c5317e0b [diff] |
am 896e619e: (-s ours) am ef1cb855: (-s ours) am 7d5fb3a9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit '896e619e52c8d01317d56f458f3bc7a9c5317e0b': Import translations. DO NOT MERGE