| commit | 7da4d0c57a93093c6ad8d68405ddd77a275307ab | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Mon Sep 09 22:09:01 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 09 22:09:01 2013 -0700 |
| tree | 987cae247046600889ace3b560a2de3a4db2059d | |
| parent | ab2461477bf374ee87560059ce5f6c7ce51f66aa [diff] | |
| parent | 85454403584f5b9625b75fb6770271ee74910552 [diff] |
am 85454403: (-s ours) am 5f5e8477: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '85454403584f5b9625b75fb6770271ee74910552': Import translations. DO NOT MERGE