commit | 53895480f481b0ed54b3f0600e7c971b4e0adf4c | [log] [tgz] |
---|---|---|
author | Eric Fischer <enf@google.com> | Fri Feb 10 10:20:01 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 10 10:20:01 2012 -0800 |
tree | b70e93bd1255518b34e96e7fb1ec60cd0aebc607 | |
parent | fbd1e65cd52d01280aa96e8f741c31243c518b88 [diff] | |
parent | 994b896ef15187b8e7abef679e76540d57f4b144 [diff] |
am 994b896e: (-s ours) am 4000887f: (-s ours) am 0308361b: Import translations. DO NOT MERGE * commit '994b896ef15187b8e7abef679e76540d57f4b144':