| commit | 6a5e14446775846c551f4954dd47a5a84e721f1c | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Mar 20 23:17:11 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 20 23:17:11 2015 +0000 |
| tree | 93bc72c4bfbc7da41d43bae78b4e593e192ea749 | |
| parent | 88510630d83148b127ce05485433f6d99eb0d13e [diff] | |
| parent | fa35c2314e4da013cb0818b030450dbbf03fe189 [diff] |
am fa35c231: (-s ours) am 68172788: (-s ours) am 985d635c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'fa35c2314e4da013cb0818b030450dbbf03fe189':