| commit | 8e084bbd326238e711acd868283ae33818b612ca | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Mon Nov 11 14:44:58 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 11 14:44:58 2013 -0800 |
| tree | 4ee45334961ab4c79820d37768d0018a091e2564 | |
| parent | f488cd3b77c064c29040edc5af1fc98d6faa994e [diff] | |
| parent | 17d19c27c00e6774c14ec45084dee988f59f6f0b [diff] |
am 17d19c27: (-s ours) am c0c41cbe: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '17d19c27c00e6774c14ec45084dee988f59f6f0b': Import translations. DO NOT MERGE