| commit | 5cc5c787e0d905cbb78bd5193992a3a411ec0940 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Sat Aug 01 17:15:40 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 01 17:15:40 2015 +0000 |
| tree | 999ec56c09b7f188e75f6dcb40b3b779a0cb60f2 | |
| parent | 67008a598da8cc73b035bbc93b25166b1c058a89 [diff] | |
| parent | 37af77d3751d43c3f32b22c4393ed841fa81f5b5 [diff] |
am 37af77d3: (-s ours) am 6c6e5388: (-s ours) am c9692826: (-s ours) Import translations. DO NOT MERGE * commit '37af77d3751d43c3f32b22c4393ed841fa81f5b5': Import translations. DO NOT MERGE