commit | 2271a91c327cee8a6c1dffcbfd3419c95d56c37e | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Thu Apr 10 15:58:38 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Apr 10 15:58:38 2014 +0000 |
tree | ae7b62a6f3266effd4074d2077dfc4db56cd983d | |
parent | 8c22e3674258261d9870f48e752572d438838fe1 [diff] | |
parent | cd5e3f85fc9228b943ee8dfda0951e068953596c [diff] |
am cd5e3f85: (-s ours) am da6b9599: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev * commit 'cd5e3f85fc9228b943ee8dfda0951e068953596c': Import translations. DO NOT MERGE