| commit | aa010a5be47affda2301cfbd3c7f049c5713e092 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Sat Aug 01 16:55:51 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 01 16:55:51 2015 +0000 |
| tree | 740ed8d326a2da72a6a6286c13d6e5417ea62101 | |
| parent | bd7148418a8089a795eb321087afe81ed90cbe2f [diff] | |
| parent | 4c487773bcf74913a47fedebb1103a361f56be9e [diff] |
am 4c487773: (-s ours) am abd8e71a: (-s ours) Import translations. DO NOT MERGE * commit '4c487773bcf74913a47fedebb1103a361f56be9e': Import translations. DO NOT MERGE