| commit | 78f804957632a1de5fbb892da03928d9ffa87cd8 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jul 13 15:31:42 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 13 15:31:42 2015 +0000 |
| tree | 3060bc13a7f7741300eaadc20f39e3817b34127e | |
| parent | f88d6c91f739b4c13a9d3b63734e6369bd1a9d38 [diff] | |
| parent | 727924f9956e725310295e2375ed1d3aed54adda [diff] |
am 727924f9: (-s ours) am 902dc418: (-s ours) Import translations. DO NOT MERGE * commit '727924f9956e725310295e2375ed1d3aed54adda': Import translations. DO NOT MERGE