| commit | bd7d5342fdf4a3d2bcd880d111cb6a23395541ab | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Aug 27 12:18:36 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 12:18:36 2015 +0000 |
| tree | a5dfa9d1f9fd23340911dd5dd9a26067ef5f6915 | |
| parent | 55e80dcd5ba22801024eba45623893643aca2e11 [diff] | |
| parent | c1f028fe4484a745b741bc27ee87155bc4492389 [diff] |
am c1f028fe: (-s ours) am c362ec4b: (-s ours) Import translations. DO NOT MERGE * commit 'c1f028fe4484a745b741bc27ee87155bc4492389':