| commit | ef541aa91de550972fb9fa98f5292ff84c1fcd83 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Tue Oct 28 07:13:51 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 28 07:13:51 2014 +0000 |
| tree | f38345d68a324670866c0ec66e16bdb7cef17ee5 | |
| parent | 6474503b155fd1552e2cca8ab71343a3ec35454d [diff] | |
| parent | d0384c1d3e641f4eda78a296a6beed6ee442e0fe [diff] |
am d0384c1d: (-s ours) am 34e8a1fe: (-s ours) am c04edfc3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'd0384c1d3e641f4eda78a296a6beed6ee442e0fe':