| commit | e3635597a9e9395c4a47e60c9fdd09beaf7747fc | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Tue Apr 30 14:05:13 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 30 14:05:13 2013 -0700 |
| tree | e4eab34b50299cabc52491e20d607f70acfb5fbf | |
| parent | c2082a7fae39204bbd7d0d8d98cbed3c90608e14 [diff] | |
| parent | 711cbd4cad2dd425d46bf1363283e501597b2e77 [diff] |
am f2eece87: (-s ours) am e0502615: am 680a9d72: (-s ours) Merge "Import translations. DO NOT MERGE" * commit 'f2eece8791cfe8851040152d027c105263482cfd':
