tree bb1dc307c2e50e5df94e485cd50018c5c2ffe663
parent c81705d6f6b82e29b19b94ce5fe75196b6a23d36
parent 6016cf6ae355fa7652759acf7e530c25052d9219
author Geoff Mendal <mendal@google.com> 1403557063 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1403557063 +0000

am 6016cf6a: (-s ours) am 6ad0404d: (-s ours) Import translations. DO NOT MERGE

* commit '6016cf6ae355fa7652759acf7e530c25052d9219':