| commit | 9b3b1c0316ac029d90ab9523096559f14254846f | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Aug 27 11:18:52 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:18:52 2015 +0000 |
| tree | d14ba40cf46738e40d7947a078dd587dfb440fba | |
| parent | b1f0eb710543cd912f14d1383913d48b46dee19c [diff] | |
| parent | 68233cb99c588718cbb07548c7b26bbd12a7b2d2 [diff] |
am 68233cb9: (-s ours) am c7386917: (-s ours) Import translations. DO NOT MERGE * commit '68233cb99c588718cbb07548c7b26bbd12a7b2d2':