| commit | a2d2b04b5dcce6f618e87dc54c3b8d1e39466b8d | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jun 03 22:20:53 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 03 22:20:53 2015 +0000 |
| tree | 157dd74d8a020ad0fcbd22f378dad17f01fe003d | |
| parent | 5dd11926193ed35982d0387d9d0ac64f6c8bfd9b [diff] | |
| parent | 269e9ab8a1da9975b83182675ce1dee029e1aa5a [diff] |
am 269e9ab8: (-s ours) am fa5151e7: (-s ours) am a39fd457: (-s ours) Import translations. DO NOT MERGE * commit '269e9ab8a1da9975b83182675ce1dee029e1aa5a': Import translations. DO NOT MERGE