| commit | c495c5bdcb3c1d52c8bb6652df9cdbfd5416788f | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Mon Jul 07 19:46:20 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 07 19:46:20 2014 +0000 |
| tree | 1e7ed951151bc9b7bf7bcc8ce5c0c0a3befb31b9 | |
| parent | a296c3553edeab5f4aa673f4a045d2e366212bcc [diff] | |
| parent | 711a12f90fdf2e74c1a64026148cc29d1a123fbd [diff] |
am 711a12f9: (-s ours) am 73a43617: (-s ours) am 007cbcbb: (-s ours) am 3163d3c6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '711a12f90fdf2e74c1a64026148cc29d1a123fbd': Import translations. DO NOT MERGE