| commit | b6c3d5b4ac9300fdb2902509ff485feadcae9553 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Wed Nov 20 13:16:20 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 20 13:16:20 2013 -0800 |
| tree | 31fdca54115a40f8f1ed384c000795b9316360ea | |
| parent | 214c250354166ee783aef2ed69aa678880995f46 [diff] | |
| parent | ed95cabf4cd13febec213ad342d947c7c847180c [diff] |
am ed95cabf: (-s ours) am bc77af5b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'ed95cabf4cd13febec213ad342d947c7c847180c': Import translations. DO NOT MERGE