| commit | eda69db7427804d177762e4c8d066c368b84a33a | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Fri Jul 24 17:32:40 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 24 17:32:40 2015 +0000 |
| tree | 4a057e1e155e6b81c265232655748fe8e24594ed | |
| parent | dd61f6e14ffac3043ae59e426b12424bd66a9de9 [diff] | |
| parent | 1367ed0ed6e470218de3c0d5b8e2cf3575da4c74 [diff] |
am 1367ed0e: (-s ours) am 12c4b02b: (-s ours) am 818b47a9: (-s ours) am 4477e6d5: (-s ours) Import translations. DO NOT MERGE * commit '1367ed0ed6e470218de3c0d5b8e2cf3575da4c74': Import translations. DO NOT MERGE