| commit | e93e1b86a6154ec3f728a89aa8283cfdd2912d14 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Fri Jul 24 04:50:07 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 24 04:50:07 2015 +0000 |
| tree | 5e42074c25002c31b1644d7890ddc1ff55eb9025 | |
| parent | c4b467e1f3d5084a88a72931318d233605b3b173 [diff] | |
| parent | 4a74e0761d6567ed3af5da86903e80d2dbf9cb78 [diff] |
am 4a74e076: (-s ours) am 03fe71ed: (-s ours) am cb113be5: (-s ours) am 28718aeb: (-s ours) Import translations. DO NOT MERGE * commit '4a74e0761d6567ed3af5da86903e80d2dbf9cb78': Import translations. DO NOT MERGE