| commit | 1f0b8d12921a5e022ca0cf249a555b5b1021091e | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Aug 27 11:16:50 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:16:50 2015 +0000 |
| tree | fbb275f0fe01e5ab5f39bf9b826b9652e345f4f5 | |
| parent | 5c2ca0ce0d5340e1b631419da4388b1443d4354f [diff] | |
| parent | 059841010c44ba9b5bab2d713eeb6ee70a89fce9 [diff] |
am 05984101: (-s ours) am cf2b3aea: (-s ours) Import translations. DO NOT MERGE * commit '059841010c44ba9b5bab2d713eeb6ee70a89fce9':