| commit | db18df6727d78371a5622ea13176cc900fef09bd | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Sat Aug 01 17:56:25 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 01 17:56:25 2015 +0000 |
| tree | 67204578e4fd52804e9adfe84bf200d2cf869208 | |
| parent | 07494e21bc7396b796add65f139ed2cc08597dba [diff] | |
| parent | 33461f5253ef8a06e48fa97bb6367ede4435bf65 [diff] |
am 33461f52: (-s ours) am aa010a5b: (-s ours) am 4c487773: (-s ours) am abd8e71a: (-s ours) Import translations. DO NOT MERGE * commit '33461f5253ef8a06e48fa97bb6367ede4435bf65': Import translations. DO NOT MERGE