| commit | 7151071a2dadd1f07bf9d6e68018d126fb57fc7b | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Nov 01 07:44:25 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 01 07:44:25 2013 -0700 |
| tree | 346c7e91b326ff70aa33c762e71a59f7f8b741e1 | |
| parent | 003ab56e84b5b4621aa3491b359a7a5f30224546 [diff] | |
| parent | a842a0813cbda44facfcb6493a5f9f70a27d8024 [diff] |
am a842a081: (-s ours) am a053e1ff: (-s ours) am 3f4c6bb5: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'a842a0813cbda44facfcb6493a5f9f70a27d8024': Import translations. DO NOT MERGE