| commit | f3a291b785dceb62a23758fadf65e78de84a9780 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Mar 12 17:25:26 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 12 17:25:26 2015 +0000 |
| tree | 0d265572bd4eb44899293827717306636d1aecf6 | |
| parent | d1605438b26dfc38234d73f7fdd4662eddcbb925 [diff] | |
| parent | 3335973a6710135a299a615c7a48555c51586e97 [diff] |
am 3335973a: (-s ours) am f02db6b7: (-s ours) Import translations. DO NOT MERGE * commit '3335973a6710135a299a615c7a48555c51586e97': Import translations. DO NOT MERGE