| commit | 6474503b155fd1552e2cca8ab71343a3ec35454d | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Tue Oct 28 07:13:50 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 28 07:13:50 2014 +0000 |
| tree | f38345d68a324670866c0ec66e16bdb7cef17ee5 | |
| parent | 867f2d494ab104e834538aff78956d881b8bfaf0 [diff] | |
| parent | edd51699eccbb684f296d754706e6f36dcab1f6f [diff] |
am edd51699: (-s ours) am b209b0af: (-s ours) am 815b31f9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'edd51699eccbb684f296d754706e6f36dcab1f6f':