| commit | 0bd3f1e53caf2596806ccbe61ea8e041abf42a6f | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Tue Apr 30 14:05:18 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 30 14:05:18 2013 -0700 |
| tree | e4eab34b50299cabc52491e20d607f70acfb5fbf | |
| parent | cca6a5183a739e6ea24b992a3b54efcf3f1e56a8 [diff] | |
| parent | b8304dfa13124563689cc32af0bfdf3c54d57b9f [diff] |
am 204d2ac2: (-s ours) am 0f49d40e: (-s ours) am 9922002f: (-s ours) Merge "Import translations. DO NOT MERGE" * commit '204d2ac2cab627d920563e4876e053910fb1d7ff':
