commit | aadd6e516a84b5ea65ffbf659efde6166ef8fcd5 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Mon Nov 25 13:04:44 2013 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 25 13:04:44 2013 -0800 |
tree | e626546a07a572b916e0f7d5ea99782128273140 | |
parent | f2ae37b3d4cfa9e867bf5752f0138bfeba61a30a [diff] | |
parent | 5f87bb027ce5799ce88da15f88ca4b4f36f88007 [diff] |
am 5f87bb02: (-s ours) am c2d1fdac: (-s ours) am d82e8f2b: (-s ours) Import translations. DO NOT MERGE * commit '5f87bb027ce5799ce88da15f88ca4b4f36f88007': Import translations. DO NOT MERGE