| commit | e6897552c2f7e79660cffce68912b046aaad40bc | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Sun Aug 17 14:31:10 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Aug 17 14:31:10 2014 +0000 |
| tree | ba826422983b739fb75285ffe93b26077a40c8c0 | |
| parent | e6bd661d739f7efb2f23ec8f4068db1be4efe3da [diff] | |
| parent | 7f436dee8d1097671332cc1bf7fa178092de09b5 [diff] |
am 7f436dee: (-s ours) am ab9a0774: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '7f436dee8d1097671332cc1bf7fa178092de09b5': Import translations. DO NOT MERGE