| commit | ae0227b100c114acc59184437d4cb3e888b371f0 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Nov 01 08:12:16 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 01 08:12:16 2013 -0700 |
| tree | 4eeec64e051c5df5453fabc06dbd4dd4fafb3a8e | |
| parent | 03c4ea475c56d439aa6cb08312df81d54c0e5f74 [diff] | |
| parent | 02f7f7da0504ecb36168859151002d7817d95b9d [diff] |
am 02f7f7da: (-s ours) am 20675fff: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '02f7f7da0504ecb36168859151002d7817d95b9d': Import translations. DO NOT MERGE