| commit | cc54e6f69c005c8c2283abba7817b48b0de5e192 | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Tue Nov 15 12:15:12 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 15 12:15:12 2011 -0800 |
| tree | 8a443c806f9c6b353926e3df6c9442f0eff2c185 | |
| parent | a2c47aabc451b6639a2387c16856633313585c45 [diff] | |
| parent | ef6f60fe9b8a1f3426835b35f579ce5980d4ca33 [diff] |
am ef6f60fe: Merge commit \'e9d96b1a\' into nov15-conflicts * commit 'ef6f60fe9b8a1f3426835b35f579ce5980d4ca33': Import revised translations. DO NOT MERGE