tree 5786f3eaf156761d27779e4c4f5bbe6e1e4e4a7d
parent 8f89a1fba49fec29fec935240e5340ae4c979e81
parent 8dc4e71009aae8f78f4cb44fd17e1d5365ee03c5
author Geoff Mendal <mendal@google.com> 1440674992 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440674992 +0000

am 8dc4e710: (-s ours) am a5698f20: (-s ours) Import translations. DO NOT MERGE

* commit '8dc4e71009aae8f78f4cb44fd17e1d5365ee03c5':