| commit | c9e9d41b38d92b567df94a1cd87517de1e57e4d4 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Tue Sep 16 16:50:32 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 16 16:50:32 2014 +0000 |
| tree | d5006f64f76a9b03ac225ee3bae3b63e651a81e6 | |
| parent | 755df5d288d936e4278c485964c39067f24e4076 [diff] | |
| parent | 2a014399aef1b7d404e0f7ebcf9aa4074b7c0b3c [diff] |
am 2a014399: (-s ours) am 76556a1b: (-s ours) Import translations. DO NOT MERGE * commit '2a014399aef1b7d404e0f7ebcf9aa4074b7c0b3c': Import translations. DO NOT MERGE