commit | 8958fcf16eea91bc081205b557f7b03185ce991a | [log] [tgz] |
---|---|---|
author | Eric Fischer <enf@google.com> | Wed May 16 09:53:11 2012 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 16 09:53:11 2012 -0700 |
tree | e6bfa6384864e7ad3b83123c00d10795a9e82836 | |
parent | 09675b89a6c4128c6fc87068eca039a41aac4b97 [diff] | |
parent | ecb1616cb5b1104308492d87ca63a97b9ebbe0fc [diff] |
am ecb1616c: (-s ours) am e78218b8: Merge "Import translations. DO NOT MERGE" into jb-dev * commit 'ecb1616cb5b1104308492d87ca63a97b9ebbe0fc': Import translations. DO NOT MERGE