tree 2819d0df63ebb34bd29d50d1fb81fc77d9581d47
parent 010b53528700dc907f6059961351f809074353f6
parent 97d52c83096dca49867fd6e5b86ec4fe5605056c
author Eric Fischer <enf@google.com> 1365535883 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1365535883 -0700

am 79361f84: (-s ours) am a97c5fbb: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-dev

* commit '79361f84cd616ee46b5522fd34ce27f948b5e701':