| commit | 9e0ffd35a534ee5c2f81bcb2685fd997243ea406 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Wed May 01 20:47:19 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 01 20:47:19 2013 -0700 |
| tree | bf42551525b93ca0c6b828f3f82bd63baa7a7ebf | |
| parent | 39b3bf8df110eb8be3d61a64bb050ebb7546ac38 [diff] | |
| parent | f9a4732e3baa2fdc6a27a1488cdb6f00a4f685d8 [diff] |
am f9a4732e: (-s ours) am f7e4057f: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit 'f9a4732e3baa2fdc6a27a1488cdb6f00a4f685d8': Import translations. DO NOT MERGE