commit | 4fff6a04988aa47ec716068d41cde1858dc52def | [log] [tgz] |
---|---|---|
author | Eric Fischer <enf@google.com> | Wed Jun 06 17:14:01 2012 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 06 17:14:01 2012 -0700 |
tree | d7885d42184e8a8cc453efc10a02d56ced30aa4e | |
parent | f4d42d07ac7aa81fc3617b1b5aa8275ed85f821b [diff] | |
parent | c27646cd2705786b33e23edd7f3902e40afecab8 [diff] |
am c27646cd: (-s ours) am 69b4e411: Merge "Import translations. DO NOT MERGE" into jb-dev * commit 'c27646cd2705786b33e23edd7f3902e40afecab8': Import translations. DO NOT MERGE