| commit | 468daeb79106a71226382c3a6d41232addba1f9f | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu Sep 11 18:31:56 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 11 18:31:56 2014 +0000 |
| tree | e4f48b0b9fba648758dfea0d3696b74e9df2faea | |
| parent | c24340f956c16d8594c44d45685f8a814538245b [diff] | |
| parent | 8aa543017109daa52bd1b6ef4e3d185f7cbfa119 [diff] |
am 8aa54301: (-s ours) am 64dd48e3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '8aa543017109daa52bd1b6ef4e3d185f7cbfa119': Import translations. DO NOT MERGE