| commit | a9ab2a62dfad586b4ea307321b6330bdc468497b | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Feb 21 17:05:58 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 21 17:05:58 2014 +0000 |
| tree | 77ae6dc696eb7f2942e6d5bfebdccb95eebf8a6e | |
| parent | 17069e39904d3d5f9cb2210a7c023416fdcdfeb0 [diff] | |
| parent | b4b0e65ed8d4bfcf88a14e66b21973e447669c4d [diff] |
am b4b0e65e: (-s ours) am b76ca05f: (-s ours) am fb52c953: (-s ours) am 4b9936d3: (-s ours) am 801517fe: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'b4b0e65ed8d4bfcf88a14e66b21973e447669c4d': Import translations. DO NOT MERGE