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