| commit | c5246d9fef695a848e2523702dc9f752e94bc6e9 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Fri Jul 24 03:07:51 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 24 03:07:51 2015 +0000 |
| tree | 30d3cb6c6242760f586e517ad98c5617d35d8a54 | |
| parent | a8937f13f8ae17a29ce56a804a67c7e6560d232b [diff] | |
| parent | 22a824fe4f4c7a1a1de26b0d0f7650ca06d5217f [diff] |
am 22a824fe: (-s ours) am 13edc160: (-s ours) Import translations. DO NOT MERGE * commit '22a824fe4f4c7a1a1de26b0d0f7650ca06d5217f': Import translations. DO NOT MERGE