| commit | df748c9e78442dacaff68a40f6fbb2671fc5b54b | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Aug 27 11:17:41 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:17:41 2015 +0000 |
| tree | 8c7d43f9068b85b8c8167d2923f4602fcccc33f7 | |
| parent | a053597a7176284247b45ca81328e934c98993cd [diff] | |
| parent | a0b2ede21fd14fa7f5012c6158e9936f8ef4b7ca [diff] |
am a0b2ede2: (-s ours) am 4477e6d5: (-s ours) Import translations. DO NOT MERGE * commit 'a0b2ede21fd14fa7f5012c6158e9936f8ef4b7ca':