| commit | a074a5df739c3275287f03225ec01bae26cbc7ad | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 13 18:46:32 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 13 18:46:32 2014 +0000 |
| tree | 24945a41eec94300eec88463193d4905dc5bb302 | |
| parent | 521b55c213226ccad30d3e9e50479118dde25822 [diff] | |
| parent | 3c68a82ae8ff9472d17d91e6d7556121f883d31d [diff] |
am 3c68a82a: (-s ours) Merge "Import translations. DO NOT MERGE" * commit '3c68a82ae8ff9472d17d91e6d7556121f883d31d': Import translations. DO NOT MERGE