| commit | f230b0e0780059dbeebf11d4b576d6f5e44aa5d6 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Aug 27 11:16:52 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:16:52 2015 +0000 |
| tree | 35bb7fb721b11264c812f8e975b51ebc854b5fe9 | |
| parent | a34d008631ce8f17d1525ce693b49a1b6a05b702 [diff] | |
| parent | 84515ac31985171915c18b2fa9a29041a1903317 [diff] |
am 84515ac3: (-s ours) am 040b8559: (-s ours) Import translations. DO NOT MERGE * commit '84515ac31985171915c18b2fa9a29041a1903317':