| commit | a93f8afab3952d6e6c820cc6c59f5899ff2f570c | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Wed Apr 30 12:54:19 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 30 12:54:19 2014 +0000 |
| tree | 51cd24518b1e35875755d3f2a1b01d969afbd2d2 | |
| parent | f6b22fb5ed982ede3b513b41750fc673d48b9714 [diff] | |
| parent | 7b7476fd9f27db9d59917ba86e357ea3350f98a9 [diff] |
am 7b7476fd: (-s ours) am 47467f86: (-s ours) am d601e973: (-s ours) am 61365506: (-s ours) am 366822da: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '7b7476fd9f27db9d59917ba86e357ea3350f98a9':