| commit | f442fb7d0a919a5b83a39b148f50acbda29fad7c | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon May 25 13:34:10 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon May 25 13:34:10 2015 +0000 |
| tree | 1f8dfc4946b6d7e3b3ddb4b79ac0a48447fe8c92 | |
| parent | d06ae2dcf947be3cd75b2a8eba615c50bc53b8f1 [diff] | |
| parent | 4a1e2d456d8333ea1b243081007e7f3a25b0af30 [diff] |
am 4a1e2d45: (-s ours) am 2e1bfd30: (-s ours) Import translations. DO NOT MERGE * commit '4a1e2d456d8333ea1b243081007e7f3a25b0af30': Import translations. DO NOT MERGE