| commit | 47467f8626cbf307880c022418263afed331759b | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Wed Apr 30 00:59:18 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 30 00:59:18 2014 +0000 |
| tree | d480a9df18213d791f716ded764bcd22e74dbd2d | |
| parent | 97e6b529e96c4f2362bc9a030bac0b1a0b600386 [diff] | |
| parent | d601e9736531937c8da7b1ac47f45b17e6dfe440 [diff] |
am d601e973: (-s ours) am 61365506: (-s ours) am 366822da: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'd601e9736531937c8da7b1ac47f45b17e6dfe440':