| commit | 9e7de699355f5b578ef731b895b71e55c411de67 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jan 19 18:13:44 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jan 19 18:13:44 2015 +0000 |
| tree | 0853f2740c83af2763e0eceb94e72ae681680d46 | |
| parent | 8cfd049118df6a023de78b4b909aeb8c5b67ef29 [diff] | |
| parent | 7710610dc1ce722a8f5a4a4e0bff82c97c156745 [diff] |
am 7710610d: (-s ours) Merge "Import translations. DO NOT MERGE" * commit '7710610dc1ce722a8f5a4a4e0bff82c97c156745': Import translations. DO NOT MERGE