| commit | e9e86b33536549272c732abf797034bc06d937d7 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Mar 20 23:13:15 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 20 23:13:15 2015 +0000 |
| tree | 648b1d3d905516553b8a4d7062ab5a96d317d54b | |
| parent | fc66517892ad9eed43c1428ca8ffc16e4f5eaf79 [diff] | |
| parent | 20275c8abad6af8088436dd2166653bc58b89205 [diff] |
am 20275c8a: (-s ours) am f1400dfb: (-s ours) am f9dff62b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '20275c8abad6af8088436dd2166653bc58b89205':