| commit | 2abea40a9aecde44739b70fd7a31c03ab76ad5ac | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Wed Oct 29 07:01:48 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 29 07:01:48 2014 +0000 |
| tree | 10da860fcff71886af91d082e31f0e1917926848 | |
| parent | f49baea5099606d314d66233291f10a8727c183f [diff] | |
| parent | 7a50fdff44faba488190cabaa3b907111b31bb06 [diff] |
am 7a50fdff: (-s ours) am ef69114f: (-s ours) am 738ad8f5: (-s ours) am 88b88fc5: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit * commit '7a50fdff44faba488190cabaa3b907111b31bb06':