| commit | b026fa1ffcbcc97ecc609213a3e7b729591fb67d | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Sat Oct 25 19:54:08 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Oct 25 19:54:08 2014 +0000 |
| tree | 631f292f06f13d22620bfd68f94ab1e55b717cf4 | |
| parent | fd23c3f1a2e33bde9f1e0312a37f20aafd291d9c [diff] | |
| parent | 3bef59abfcd6fa48df33b36fb17960289b721f8c [diff] |
am 3bef59ab: (-s ours) am 3a39d4e2: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '3bef59abfcd6fa48df33b36fb17960289b721f8c':