| commit | 5b634929763b1b481ad642770756bc67ac89080f | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Aug 15 22:35:35 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 15 22:35:35 2014 +0000 |
| tree | 94f6d08290ab11bcf9cb897270fd3577fd9cdaf6 | |
| parent | 129ad0e15bafe65f3060b7bd4ea9eb973ece767b [diff] | |
| parent | 3f374ac15c99468abee39489c23dfa3f571689b1 [diff] |
am 3f374ac1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev * commit '3f374ac15c99468abee39489c23dfa3f571689b1': Import translations. DO NOT MERGE