| commit | aa24c60ac639aa39cc312f4409a0abff47f09af4 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Nov 07 15:33:18 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 07 15:33:18 2014 +0000 |
| tree | 8c6aa5fcd8224131fb389ca333d61cafb4bfbf3e | |
| parent | fc0a5a582a1becf3756a1b77b6c7f88eb1f42265 [diff] | |
| parent | 3211f226a1de83a7cbf52017eb26b22ae0eb4bdb [diff] |
am d2eb251e: (-s ours) am 44e6948c: (-s ours) am 6eef366a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit 'd2eb251eb97e6c69db40e14be38d5813cead0037': Import translations. DO NOT MERGE