| commit | 9d1ac76151817d3b7ad620742f28467c869a6b68 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Mar 20 23:14:00 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 20 23:14:00 2015 +0000 |
| tree | 648b1d3d905516553b8a4d7062ab5a96d317d54b | |
| parent | cb149643f010ffb2d0e26f664d5195c5624c8e2a [diff] | |
| parent | 4581139d5d9c2e174da56242c3ceff8cf934f816 [diff] |
am 4581139d: (-s ours) am 7b316d04: (-s ours) am 0e05cef7: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '4581139d5d9c2e174da56242c3ceff8cf934f816':