| commit | eb374d9f2b82ebbd3d780ffee928937619762801 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Aug 15 22:35:47 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 15 22:35:47 2014 +0000 |
| tree | 4b1bf7c43eddc14cd87697d9c76cfa60d96cc073 | |
| parent | ace061b16563005d06ce24735833f22a49c8e61f [diff] | |
| parent | babf889f63a0c1d239345c275ef9deb9b15eb9b2 [diff] |
am db511f23: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev * commit 'db511f2372fb542baa83838d9552d249a8c2f164': Import translations. DO NOT MERGE