| commit | 01daad46fcd120807ebe7035ca515ce05364b229 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Aug 27 11:16:25 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:16:25 2015 +0000 |
| tree | 3a127674d57425a52aa7576db7500c50e3d511ba | |
| parent | a15273203442be495e6f4ec49718af928695658f [diff] | |
| parent | 2dae166977a9cea6f49c6d1ecaf50415bb01088f [diff] |
am 2dae1669: (-s ours) am d9662ac6: (-s ours) Import translations. DO NOT MERGE * commit '2dae166977a9cea6f49c6d1ecaf50415bb01088f':