| commit | 14cc7647cb68a340fad4bf2f885ed34f83e3c5ed | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Wed Mar 12 20:40:19 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Mar 12 20:40:19 2014 +0000 |
| tree | 81433cb7a44664d26db79fd7ce4d32901fb42884 | |
| parent | 23d01e0b4b936b11c33768a5a8dc8226102386d0 [diff] | |
| parent | 846f036ef15a2bea6c522e5b75b351b28c29953c [diff] |
am 846f036e: (-s ours) am 14b82fd7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '846f036ef15a2bea6c522e5b75b351b28c29953c': Import translations. DO NOT MERGE