| commit | 2c2bbfb9c3d55eafe4711a7d02fb8d3a3531e247 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu May 22 03:17:12 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 22 03:17:12 2014 +0000 |
| tree | b51ce37457ea5b5eae1fd57f33c6a0375ad4fe63 | |
| parent | edf10cc26d579019a932cd3b23b4d77586c2370f [diff] | |
| parent | 48137740b8f0af0efad73c052256af14e1825944 [diff] |
am 48137740: (-s ours) am b9c1e5a8: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev * commit '48137740b8f0af0efad73c052256af14e1825944': Import translations. DO NOT MERGE