| commit | e83a1adb0a09898a9afa5ac6e3968ece13d3db47 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Oct 11 08:48:16 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 11 08:48:16 2013 -0700 |
| tree | ae60d1da2370b7d0a0d25e908483fbe556e1519e | |
| parent | 4fd2f2e535294f00f65f45d893d4ea1e67624b7f [diff] | |
| parent | 1789d83949241abae6475ba9ff53247f8f4c613e [diff] |
am 1789d839: (-s ours) am e35594f9: (-s ours) am 3c8bbd2f: (-s ours) am 40823338: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '1789d83949241abae6475ba9ff53247f8f4c613e': Import translations. DO NOT MERGE