| commit | a6d8425760ff3e10f3351545ac7e01e8626fdd8c | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 16:54:09 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 16:54:09 2015 +0000 |
| tree | 156318d1e7602a679e0bb7d9834512a17995ea14 | |
| parent | d6cba73e4c0ec4c4f2f47957873f0983620ff9c4 [diff] | |
| parent | 1aceaa3c2b19e352cf9f16c73fd03dab881a4434 [diff] |
am 1aceaa3c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit '1aceaa3c2b19e352cf9f16c73fd03dab881a4434': Import translations. DO NOT MERGE