| commit | b903e3bcd61e39b551ed43d3c8d100c302b2478b | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Tue Sep 16 18:22:25 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 16 18:22:25 2014 +0000 |
| tree | 5fc024fbda4e9816cbf71f5bb0d9ae4ecb6fc6d2 | |
| parent | f4a273ccb9ffd9db60d870b6a0d92e7d6ff7e267 [diff] | |
| parent | 1bddfbbaa79960c353a6115f18105e5ef697d0fa [diff] |
am 1bddfbba: (-s ours) am 923950d1: (-s ours) am d5937725: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '1bddfbbaa79960c353a6115f18105e5ef697d0fa': Import translations. DO NOT MERGE