| commit | 7208e5ab688192494a634cb1408261f46ccb1ef5 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jul 13 16:02:40 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 13 16:02:40 2015 +0000 |
| tree | 50528d96f58009b20a56ce829998dd206c8c906c | |
| parent | 48dc8a2c00ec2bf09c39cffc4d654f841cea4277 [diff] | |
| parent | 5067852494c939fd88e88da8c7fbd528fbb5e622 [diff] |
am 50678524: (-s ours) am 1d1d42a2: (-s ours) am cf66f383: (-s ours) am fd4effa0: (-s ours) Import translations. DO NOT MERGE * commit '5067852494c939fd88e88da8c7fbd528fbb5e622': Import translations. DO NOT MERGE