tree f8e23431207ebac6f3d86f039f21c1bd101289eb
parent 1584da525219fc4327f2ad0ed3fa3ce1471c1e6a
parent 96edc4c8d0e9cf24c59b83157c3d57a47e839e49
author Geoff Mendal <mendal@google.com> 1440677792 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440677792 +0000

am 96edc4c8: (-s ours) am e5ec4ac4: (-s ours) Import translations. DO NOT MERGE

* commit '96edc4c8d0e9cf24c59b83157c3d57a47e839e49':