| commit | ea8d450ad4e791770551fbc73985f5aa4087b847 | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Tue Apr 23 10:33:11 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 23 10:33:11 2013 -0700 |
| tree | 2432aee3e69979303ae430b6c6644588f826332b | |
| parent | b9b585f351e882c711c5e4ebadff27ecc8bdc3aa [diff] | |
| parent | e09e57c63528bf1ecacd0c534cc61aea396c9a9e [diff] |
am 6336d308: (-s ours) am 06e1da6c: (-s ours) am 79361f84: (-s ours) am a97c5fbb: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-dev * commit '6336d3087c03a2d7997e5493a36bad9d34751fa9':
