tree cba62d0d64153aa2169651696bc238591341d679
parent 63428443cb81283f2d233fec22f8e941a53045a6
parent 3110a270e2965be286b368ed8d0dc7377f8182df
author Baligh Uddin <baligh@google.com> 1414085342 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085342 +0000

am 3110a270: (-s ours) am 56928729: (-s ours) am 92375487: (-s ours) am 36a300e1: (-s ours) am e1bc1951: (-s ours) Import translations. DO NOT MERGE

* commit '3110a270e2965be286b368ed8d0dc7377f8182df':