| commit | 0f85529f89b094518057e07e74acdd66972fe03e | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jul 20 15:11:34 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 20 15:11:34 2015 +0000 |
| tree | 9353d43b0d68bed46e13c655ebf88d637d52f0f1 | |
| parent | 791799c680b5d86148d69241ecc51ad843256c88 [diff] | |
| parent | 4cd88420660559c8881cfe3d5ac58ca45e33a083 [diff] |
am 4cd88420: (-s ours) am 692f3a96: (-s ours) am 61f048a4: (-s ours) Import translations. DO NOT MERGE * commit '4cd88420660559c8881cfe3d5ac58ca45e33a083': Import translations. DO NOT MERGE