commit | c4b1baadab08ac911c5178e289f7fc1bfabce07a | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Tue May 13 15:50:30 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 15:50:30 2014 +0000 |
tree | 3c368cf38b34f2cb575459652ad4eb246dbf4547 | |
parent | 2f675acdb2f9b8476017cc8bb21b6c4d34577059 [diff] | |
parent | feee9e57abcb139f455e4e0043fe94365af3b1fd [diff] |
am feee9e57: (-s ours) am a8e18c81: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev * commit 'feee9e57abcb139f455e4e0043fe94365af3b1fd': Import translations. DO NOT MERGE