| commit | 4a44f43348b593c2e49d6c7c38aa987ba4cc5d6b | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 17:08:35 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 17:08:35 2015 +0000 |
| tree | 156318d1e7602a679e0bb7d9834512a17995ea14 | |
| parent | b8d881f2505be5511f21ec2de86bc3e8523c3643 [diff] | |
| parent | d6cba73e4c0ec4c4f2f47957873f0983620ff9c4 [diff] |
am d6cba73e: (-s ours) am c8e261e9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit 'd6cba73e4c0ec4c4f2f47957873f0983620ff9c4': Import translations. DO NOT MERGE