commit | 5f4185fa76b0a4003e1dd52dfab7f3516ee34006 | [log] [tgz] |
---|---|---|
author | Eric Fischer <enf@google.com> | Tue Apr 30 14:03:58 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 30 14:03:58 2013 -0700 |
tree | ae23c2cbf4ecbb3653722bc7f973eefc0c748a61 | |
parent | 7faf095e4fd57d13906c36951b37749ff5ec4339 [diff] | |
parent | 1c98e0f966512853c9fa3d39fc9281b28d1db1ba [diff] |
am 85eee52a: am 257de1d9: (-s ours) Import translations. DO NOT MERGE * commit '85eee52a76b68f698c3b739907b6aada4fb7cee3':