| commit | cabf71183e9ba65f08ffc681f5ec5a18dd9001dd | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Wed Oct 29 07:05:34 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 29 07:05:34 2014 +0000 |
| tree | 10da860fcff71886af91d082e31f0e1917926848 | |
| parent | da5d918599441fe2486ac50e72fc68763e915889 [diff] | |
| parent | 413d81156fc7fbef4013bf6add7d6d90b8874a48 [diff] |
am 413d8115: (-s ours) am 459394de: (-s ours) am 62a708f4: (-s ours) am 339e0c19: (-s ours) am 3be0912b: (-s ours) am 2a44d878: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-jetsonic * commit '413d81156fc7fbef4013bf6add7d6d90b8874a48':