| commit | a346695a20818326b2d1a733f227f177f1be0bee | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Mon Jun 25 11:38:31 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 25 11:38:31 2012 -0700 |
| tree | f5437694d09a99dda68bd0cb295032946d86a8a7 | |
| parent | a3b6554c31931b1c7c1adbb567f20dcce4711392 [diff] | |
| parent | 764d1368d6b137e0c99ce9e7b326dc7fe25aba05 [diff] |
am 764d1368: (-s ours) am c5fc8f5c: Merge "Import translations. DO NOT MERGE" into jb-dev * commit '764d1368d6b137e0c99ce9e7b326dc7fe25aba05': Import translations. DO NOT MERGE