| commit | db9f06aaa12bc12c4ca678b8c9666ba791424cb4 | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Tue May 15 11:37:48 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 15 11:37:48 2012 -0700 |
| tree | 0b8ae3aa1b692af4ef53410ef142dc6cc8196b90 | |
| parent | 0320c526c22df6e5b7d829089ed07ab19101b638 [diff] | |
| parent | 3821f0a26ea3c46aa80bae9e94f3dccd9c295541 [diff] |
am 3821f0a2: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-dev * commit '3821f0a26ea3c46aa80bae9e94f3dccd9c295541': Import translations. DO NOT MERGE