| commit | 17b7705afb3e36a6239fdcc3fadfa6601f32fe98 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu Feb 20 18:47:45 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 20 18:47:45 2014 +0000 |
| tree | 9b4509e070e1a5aa5b484eaa3b52335c5b3f21f0 | |
| parent | c87c6a2a4630e53d8dc07eb53095776fa31c463f [diff] | |
| parent | fbb100c437d52db818e6e57c18ffe1e969ba46b0 [diff] |
am fbb100c4: (-s ours) 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 'fbb100c437d52db818e6e57c18ffe1e969ba46b0': Import translations. DO NOT MERGE