commit | eed907c2c6abef6f89f518858c082ffaa48a366a | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Tue Sep 16 17:17:21 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 16 17:17:21 2014 +0000 |
tree | 35fe6b8133e0bb525364e085a6b3b5d54a02acec | |
parent | 51de265795776130e175f72d73a9b2006e354e14 [diff] | |
parent | 57e258992539de135f8694be798ae11576c1cd33 [diff] |
am 57e25899: (-s ours) am 6cd29c10: (-s ours) am b979cd54: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '57e258992539de135f8694be798ae11576c1cd33': Import translations. DO NOT MERGE