| commit | fbb100c437d52db818e6e57c18ffe1e969ba46b0 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu Feb 20 18:43:00 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 20 18:43:00 2014 +0000 |
| tree | 9b4509e070e1a5aa5b484eaa3b52335c5b3f21f0 | |
| parent | a69996e45c7c40d971b05a56866b7ac5c7f617de [diff] | |
| parent | ea17c6365fd70b057a4c696d9eec2b5f70b6e476 [diff] |
am ea17c636: (-s ours) am 4292ce5d: (-s ours) am 810267c3: (-s ours) am 28009e81: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'ea17c6365fd70b057a4c696d9eec2b5f70b6e476': Import translations. DO NOT MERGE