| commit | 16460a4bcf0e617d6062516c07642367f961e3c1 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Wed Oct 29 07:03:12 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 29 07:03:12 2014 +0000 |
| tree | 10da860fcff71886af91d082e31f0e1917926848 | |
| parent | 135ff21147ae094a539f6268ceea83020b611f1c [diff] | |
| parent | 5e7108fee856fddd0a782b3e181d7c9f02e68972 [diff] |
am 5e7108fe: (-s ours) am 1ca1e4e4: (-s ours) am a371f3eb: (-s ours) am edaa63a3: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit * commit '5e7108fee856fddd0a782b3e181d7c9f02e68972':