commit | bef441a0ae5f6932be945ef3b87862ec84af3cf6 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Wed Sep 17 05:09:16 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 17 05:09:16 2014 +0000 |
tree | 611310b3ee31117b436f4a606ac5a9c858e62370 | |
parent | 65581fac70f35ffd7ea7443c8afc15ffb141346d [diff] | |
parent | eed907c2c6abef6f89f518858c082ffaa48a366a [diff] |
am eed907c2: (-s ours) am 57e25899: (-s ours) am 6cd29c10: (-s ours) am b979cd54: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'eed907c2c6abef6f89f518858c082ffaa48a366a': Import translations. DO NOT MERGE