| commit | 6642817b1374817ecbf662d4774de76e8e264085 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Sun Aug 17 14:31:00 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Aug 17 14:31:00 2014 +0000 |
| tree | 1799e9a33b1e5212274a22fb0057642305300d7b | |
| parent | 85b52764c54cc9e3717725a8ce49589ac93bf97c [diff] | |
| parent | cb21f780ba6fc07506607f7eac9f3cffb8b29145 [diff] |
am cb21f780: (-s ours) am a948c231: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'cb21f780ba6fc07506607f7eac9f3cffb8b29145': Import translations. DO NOT MERGE