| commit | a67a5b248fccdfd89a20ece49c4c2ae687078b33 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Mar 20 23:59:43 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 20 23:59:43 2015 +0000 |
| tree | 024d950025572adda5e6f539698973e209e75ae4 | |
| parent | 99ee03cfd2b5cfdaf7e38dcb54864e4d69933efe [diff] | |
| parent | 290b9aacd774f2477f700198df17bdb09e4c2173 [diff] |
am 290b9aac: (-s ours) am 684934e8: (-s ours) am 9b389233: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '290b9aacd774f2477f700198df17bdb09e4c2173':