| commit | 45335b0c5eeaeb068af6c35bcaa25b08cf10db9d | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 05 12:45:22 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 05 12:45:22 2015 +0000 |
| tree | fa8071070f885f177115aa1efe335fb42e775699 | |
| parent | c7b0a8162520ffedcfcddb86d1f0e394513b7cf1 [diff] | |
| parent | 0070fbfe01eab83402949298188322f1168b5b3c [diff] |
am 0070fbfe: (-s ours) am f0338376: (-s ours) Import translations. DO NOT MERGE * commit '0070fbfe01eab83402949298188322f1168b5b3c': Import translations. DO NOT MERGE