| commit | f3154ed9194dd5cabc90e71c83471fe5a43bb78c | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Aug 12 14:01:20 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 12 14:01:20 2015 +0000 |
| tree | c560330f63f0d44302791c6c42268f18c5732def | |
| parent | 745707f8cd4d4d9b16794b2e5139a09a5bb2776e [diff] | |
| parent | 378ba42a8aa11d7fd37e39c1a04ebb2ec089e6da [diff] |
am 378ba42a: (-s ours) am dfe2ed8f: (-s ours) Import translations. DO NOT MERGE * commit '378ba42a8aa11d7fd37e39c1a04ebb2ec089e6da': Import translations. DO NOT MERGE