| commit | 648361556f5809943a8d271e7eb61f6c5b72486b | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Tue Apr 30 14:05:33 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 30 14:05:33 2013 -0700 |
| tree | e4eab34b50299cabc52491e20d607f70acfb5fbf | |
| parent | 3231872b38e9301c716c82ef456c2dd9020f90a3 [diff] | |
| parent | ee3be11f40a3500ef05bf5fceccc763aa2f8bf80 [diff] |
am 152d2acf: (-s ours) am 8448c8f6: am 4cdee7a6: (-s ours) am 90817b80: (-s ours) am 8c2158e5: Import translations. DO NOT MERGE * commit '152d2acfd9b9254c725eaadf53ae148b44cf9397':
