| commit | fa6972813a2149e752a11ba001de8fd860821b14 | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Fri Jun 08 16:35:52 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 08 16:35:52 2012 -0700 |
| tree | fcadf92f2117f7cff2b55a75e0548e976c6f0e5c | |
| parent | 182ddee6a5d1d8092932df615ebe736a50b979d1 [diff] | |
| parent | 7fe56c4696cfc62655c991b7fafaded102792954 [diff] |
am 7fe56c46: (-s ours) am bce32b5e: Import translations. DO NOT MERGE * commit '7fe56c4696cfc62655c991b7fafaded102792954': Import translations. DO NOT MERGE