commit | 379dca6eb4d79ef6a05e6396facdff9295f0d5a1 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Thu Jul 24 23:35:11 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 24 23:35:11 2014 +0000 |
tree | 28becf942678f11f350a26667fbae49f3f9a9636 | |
parent | b33ff850221e9b9f5a0c413f87318ee281b69c10 [diff] | |
parent | 20f42ae42879546f0c10a7eb921d16369da5d6c9 [diff] |
am 49242492: (-s ours) am a81e8b66: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '492424924d3bc6573bd353c455458405ddb423f4': Import translations. DO NOT MERGE