tree 4ce3215693926ab94279f50f6c8520e4f05ca1fd
parent 4942613ef837bb5379e9c3e3ad458bbe3d952729
parent 1e9e1e204c4022060572ae4f63c1eab444c3d5b8
author Geoff Mendal <mendal@google.com> 1440672955 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440672955 +0000

am 1e9e1e20: (-s ours) am d28d0006: (-s ours) Import translations. DO NOT MERGE

* commit '1e9e1e204c4022060572ae4f63c1eab444c3d5b8':