| commit | f54f7724047040139b5c4b129ccdc8912c29df42 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Nov 25 15:08:23 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 25 15:08:23 2014 +0000 |
| tree | 0bc5e7975bab5658b8ace07668a5fd4fee69e2be | |
| parent | f7b1f9600e08d0540d10e4ae72e2929144b1e913 [diff] | |
| parent | 1c89781ccf2df0adde2ca04492e5f6177cbdb7a4 [diff] |
am 1c89781c: (-s ours) am 1d49da6b: (-s ours) Import translations. DO NOT MERGE * commit '1c89781ccf2df0adde2ca04492e5f6177cbdb7a4': Import translations. DO NOT MERGE