| commit | 9aa4e966fbe95afa53f70ca88c92c8e30ec0f9df | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Tue Jan 07 05:50:10 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jan 07 05:50:10 2014 +0000 |
| tree | d8d2a645079e7e380315ac3c207fbaa967c7340b | |
| parent | dfafc43c7851aff228ebdcdaac2266636d76d3c3 [diff] | |
| parent | 40719a337093cca58885e16d6e0ae7f7da5fc7ad [diff] |
am 40719a33: (-s ours) am 7b6ac45d: (-s ours) am 7cbf5af8: (-s ours) am e1f9ccbe: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '40719a337093cca58885e16d6e0ae7f7da5fc7ad': Import translations. DO NOT MERGE