commit | f965f6175f6deea4633e06eb17dc635b40e6f24a | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Mon Sep 15 23:56:11 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 15 23:56:11 2014 +0000 |
tree | 995136c88be5e85b2a72ce46ef0daf48b8e3313d | |
parent | e673a92a0cb7a4868c8109af457c1a95fdb84f71 [diff] | |
parent | b0a7b3e95c7bd55070f1a06442cb12de7d3bb23d [diff] |
am b0a7b3e9: (-s ours) am 619f4ace: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'b0a7b3e95c7bd55070f1a06442cb12de7d3bb23d':