| commit | b5ffbc81b7ec8127dadb514b6ce95ef3928c1f29 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Dec 10 22:46:41 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Dec 10 22:46:41 2014 +0000 |
| tree | 3d990f0e27d5659b607569e75d565658b739445b | |
| parent | d90066737e873868af92e4b4d239ada4f8436b42 [diff] | |
| parent | 6d134f35ec9c127c2e6166d27378800b406f7d98 [diff] |
am 6d134f35: (-s ours) am 15540b98: (-s ours) am ef319662: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '6d134f35ec9c127c2e6166d27378800b406f7d98': Import translations. DO NOT MERGE