commit | 09256980960cd5de7633f3a0f69cef2a676a6812 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Wed Nov 07 18:29:07 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 07 18:29:07 2012 -0800 |
tree | 7b11551bc113bd1a7cfe1ff3a78f7033a5e6b8c4 | |
parent | 4f1a09320321cc758df1d33358e6353d3614bdb0 [diff] | |
parent | c74ef2f28b1b095ecb3dea78ff8d277daec84f58 [diff] |
am c74ef2f2: am 7d6a0f9c: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit 'c74ef2f28b1b095ecb3dea78ff8d277daec84f58':