commit | e392251c53f18494482b1079bcb6e3b57ccb95db | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Tue Jul 22 17:09:10 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 22 17:09:10 2014 +0000 |
tree | f4c241a69f7c9505b8547906402c82a4bd4fa3da | |
parent | 44067f99b3dec17f9d5587b7144dd0ab985f85d1 [diff] | |
parent | b5c73cb52dac5ebc576acb2aff95c1f961f78954 [diff] |
am b5c73cb5: (-s ours) am c401c683: (-s ours) am 04f7179d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'b5c73cb52dac5ebc576acb2aff95c1f961f78954': Import translations. DO NOT MERGE