| commit | 4323f74aa197701b7b1ea8c45993f57563208810 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu Mar 13 18:08:56 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 13 18:08:56 2014 +0000 |
| tree | 0c39ec598d971bb0597124c50ca9db27ec549362 | |
| parent | 0fa90474e0ee085051d9ba155705b7f5d3bc7bfa [diff] | |
| parent | 5969801cc119ce58c7f18b1a9cbcc46c8b7ad232 [diff] |
am 5969801c: (-s ours) am a60df014: (-s ours) am 846f036e: (-s ours) am 14b82fd7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '5969801cc119ce58c7f18b1a9cbcc46c8b7ad232': Import translations. DO NOT MERGE