| commit | 677b7a7b024adfc3b9e87cff974acb4420a0ded1 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Wed Oct 29 07:01:49 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 29 07:01:49 2014 +0000 |
| tree | 10da860fcff71886af91d082e31f0e1917926848 | |
| parent | 2abea40a9aecde44739b70fd7a31c03ab76ad5ac [diff] | |
| parent | a594a8530659a3557c6eea733350e14d97da1c7d [diff] |
am a594a853: (-s ours) am 9d321ecf: (-s ours) am ab9135e4: (-s ours) am d40b2e99: (-s ours) am 4e4d6599: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-jetsonic * commit 'a594a8530659a3557c6eea733350e14d97da1c7d':