| commit | c40155fd235302bee7e0fb57cb848c0e1420166d | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Wed Sep 24 17:57:55 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 24 17:57:55 2014 +0000 |
| tree | 499c28dc24b8f7bcc1a9cd04398a47a6825f412e | |
| parent | 84d9bbdcd47a8be781e54cde537594132678bb99 [diff] | |
| parent | e9cc77634674e59f51feed82d9be5bdb1c2eb5ea [diff] |
am 1bf1a02a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '1bf1a02ad05cb1fb2b489609d37104fe5aaba105': Import translations. DO NOT MERGE