| commit | ffdbfaaff2f5172fc0af8d5f13ec3fad0c53f826 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 19 14:17:11 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 19 14:17:11 2015 +0000 |
| tree | f39742409d4203fc655c1fc0551b55a1d9fb3282 | |
| parent | 9c25e23c4b571f9c9ff3fd69408c4cfd03385e82 [diff] | |
| parent | 2a09706e86794f6482f005f5bcca2ee513a3b1d9 [diff] |
am 2a09706e: (-s ours) Import translations. DO NOT MERGE am: 5e4863205e -s ours * commit '2a09706e86794f6482f005f5bcca2ee513a3b1d9': Import translations. DO NOT MERGE