commit | ab3c94aecbc3c49cf88b79daac2421969d391b4f | [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 | e1cda745af733e7678435ae356513a33d19fd751 | |
parent | 395e1917963bcd3d977461dce2cdfe24de65447b [diff] | |
parent | ae18768e27795a0cf539eedbbf5ba835d7206703 [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