commit | a150debe00d48181ab01c1de442638d02487ba5c | [log] [tgz] |
---|---|---|
author | Eric Fischer <enf@google.com> | Thu May 31 11:16:47 2012 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 31 11:16:47 2012 -0700 |
tree | 6b8b98cff5f87a2867f43382595954d483d48dce | |
parent | 66537f852f60fa0b02cfa52ba67c5776a24309b5 [diff] | |
parent | f408f23f2fd26c6a335bea78c693a9eba9a89932 [diff] |
am 06baaba7: (-s ours) am a72d51b6: Import translations. DO NOT MERGE * commit '06baaba784177d3b75b8e653f3f558ece40400be': Import translations. DO NOT MERGE