tree cba62d0d64153aa2169651696bc238591341d679
parent 729869eaeafbb39044479fd504e8a5570adbf97c
parent 785ca6bb42594fff4d8d9d45c8f08e736f5733c1
author Baligh Uddin <baligh@google.com> 1414085217 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085217 +0000

am 785ca6bb: (-s ours) am fd855986: (-s ours) am baa58811: (-s ours) am 751f5fdc: (-s ours) am eb0cc542: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-indigo-rose

* commit '785ca6bb42594fff4d8d9d45c8f08e736f5733c1':