| commit | e0fe275aa48e4cc98c6bf56db47a73fe74a149e9 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Tue Mar 25 17:02:04 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 25 17:02:04 2014 +0000 |
| tree | 6470110e0fcfdd769d65cf362869376f89cf623f | |
| parent | 2c10d3a70ef31d8e8e143f031dc50a8fe071c718 [diff] | |
| parent | 46f2a32ee196c3e9a0b3328e12f274bfdc8e340d [diff] |
am 46f2a32e: (-s ours) am 8c30c2ce: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '46f2a32ee196c3e9a0b3328e12f274bfdc8e340d': Import translations. DO NOT MERGE