| commit | 32b56fd34df454ca3a47c688fe956468c3996ed1 | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Tue Jun 12 14:52:26 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 12 14:52:26 2012 -0700 |
| tree | 70768502a554f63095dffb06ead04a3a7cc402bc | |
| parent | 84bb18f4c959355cc88a8d18db0e7466f93e4267 [diff] | |
| parent | 3894e25f011595d550506edddd6d1f522f6ec90e [diff] |
am 3894e25f: (-s ours) am 62b1e672: Merge "Import translations. DO NOT MERGE" into jb-dev * commit '3894e25f011595d550506edddd6d1f522f6ec90e': Import translations. DO NOT MERGE