| commit | 197af09e7c3b5369a42eec0bb031ee2d658a6e49 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Wed Apr 30 12:50:15 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 30 12:50:15 2014 +0000 |
| tree | af39ceb9c6cb26c3ee1ea02c1e03de9a2486ac93 | |
| parent | 383aa772d8089a9f60324d35dc7573be75189c92 [diff] | |
| parent | 864a1a6af4e227bd89aebee24e829c77c8cd89e4 [diff] |
am 864a1a6a: (-s ours) am e0fe275a: (-s ours) am 46f2a32e: (-s ours) am 8c30c2ce: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '864a1a6af4e227bd89aebee24e829c77c8cd89e4':