| commit | 2302909f5ad9d98bc1e7a1d1115dca7f7f1d5031 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Sun Aug 17 14:42:27 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Aug 17 14:42:27 2014 +0000 |
| tree | a62633ec4c6fe621b167a3581de5b215692fdbed | |
| parent | 88ed469932d6762439712e5ca9a3292f10358b52 [diff] | |
| parent | 6a9ad3d6ab8ffb02c5c349f8dea4aef2649b491d [diff] |
am 6a9ad3d6: (-s ours) am 51beb6b7: (-s ours) am ec93832b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '6a9ad3d6ab8ffb02c5c349f8dea4aef2649b491d': Import translations. DO NOT MERGE