| commit | 0f041b2ebbb6fbd84803e818f065db9d0e299823 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 21:54:45 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 21:54:45 2015 +0000 |
| tree | c8c6f773cb83425081fc79f8a2b234bf8b3fb014 | |
| parent | 7ee8a992ecd703b84938f54860801254d2b47924 [diff] | |
| parent | 9e6f5d2748e31d1ab4f0f47d851c4ca55bc60bf1 [diff] |
am 9e6f5d27: (-s ours) am c7386917: (-s ours) Import translations. DO NOT MERGE * commit '9e6f5d2748e31d1ab4f0f47d851c4ca55bc60bf1': Import translations. DO NOT MERGE