| commit | af91bfbc040c47e73b0e04dc30f51ff8a9864039 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Aug 27 12:16:32 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 12:16:32 2015 +0000 |
| tree | f8e23431207ebac6f3d86f039f21c1bd101289eb | |
| parent | 1584da525219fc4327f2ad0ed3fa3ce1471c1e6a [diff] | |
| parent | 96edc4c8d0e9cf24c59b83157c3d57a47e839e49 [diff] |
am 96edc4c8: (-s ours) am e5ec4ac4: (-s ours) Import translations. DO NOT MERGE * commit '96edc4c8d0e9cf24c59b83157c3d57a47e839e49':