| commit | 8158f4ca8fda73b94aff64f7cf4ebb25b39732da | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Fri Feb 27 16:37:13 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 27 16:37:13 2015 +0000 |
| tree | a34a22fc1ec4b8ad1070b14d98f7e530bdab8088 | |
| parent | b9f03f37e94c5b2873c2f499520742c18ac6d1d5 [diff] | |
| parent | 8757d6da1d70e1bcc3ddf85c3f3ed902210667cb [diff] |
am 8757d6da: (-s ours) am 7581288f: (-s ours) Import translations. DO NOT MERGE * commit '8757d6da1d70e1bcc3ddf85c3f3ed902210667cb': Import translations. DO NOT MERGE