| commit | f6b2c46c617addd38842e90e5f7255406b901e45 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Wed Oct 29 07:07:26 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 29 07:07:26 2014 +0000 |
| tree | 10da860fcff71886af91d082e31f0e1917926848 | |
| parent | c30daa6c15c5d2a9458c4bed656018302418647b [diff] | |
| parent | fc6dab311751300cde3031626d3dbacfd15614fc [diff] |
am fc6dab31: (-s ours) am 9b4d5a42: (-s ours) am 65301b14: (-s ours) am 3d2fefae: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit * commit 'fc6dab311751300cde3031626d3dbacfd15614fc':