| commit | 11281de7a2c335ed5410fa83b275173130714f52 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Sun Jul 06 19:45:34 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Jul 06 19:45:34 2014 +0000 |
| tree | 52ce1845696e788825e05127a459d7370e0efdfe | |
| parent | de9bfb799e99440888ecd911d60f42ff206c886c [diff] | |
| parent | 89523569e4c1be2e102b5fb991023d6696384d76 [diff] |
am 89523569: (-s ours) am 314bfe07: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '89523569e4c1be2e102b5fb991023d6696384d76': Import translations. DO NOT MERGE