| commit | 5f60e1e4eb05f7cbd48542afda4b3382e19403de | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu Dec 05 22:51:20 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 05 22:51:20 2013 +0000 |
| tree | adb64c650885008a1b21eaedbeb3b9fc778f44aa | |
| parent | 9d062451d426080589952b2950ab3cc5e1145884 [diff] | |
| parent | d22f6a6296b0fc7dee08bc442a54343c1b478a4c [diff] |
am d22f6a62: (-s ours) am 61c9706b: (-s ours) am 43e56c4a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'd22f6a6296b0fc7dee08bc442a54343c1b478a4c':