| commit | f7ade46cc5edb1f2f369ae22070b786729754932 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Wed Oct 01 17:20:34 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 01 17:20:34 2014 +0000 |
| tree | d066a99b326cac6be38e9717cb969561b9fcc76a | |
| parent | 394f29e7618952fb6eee7ca53f434b418bbd3ded [diff] | |
| parent | 7249a8bba9fed353c18c94fbe44cf24fba024620 [diff] |
am 7249a8bb: (-s ours) am ff99ff98: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '7249a8bba9fed353c18c94fbe44cf24fba024620': Import translations. DO NOT MERGE