| commit | 965048d992af142a3314726b738d43a96aec3764 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Sun Oct 19 22:44:08 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Oct 19 22:44:08 2014 +0000 |
| tree | 35177ce3c6cf8d873ea0f220bd9dc71fa69105f3 | |
| parent | 5aa08a0b5a1346a7561b2ee70e277dc8c170ec5d [diff] | |
| parent | 2ffe6a2340ab05fb38f5051a1ce35b12af895fce [diff] |
am 2ffe6a23: (-s ours) am d25f8443: (-s ours) am 6a887105: (-s ours) am c04edfc3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '2ffe6a2340ab05fb38f5051a1ce35b12af895fce': Import translations. DO NOT MERGE