tree cba62d0d64153aa2169651696bc238591341d679
parent 53997cf353ab36c3b461706166dc117e2014fe54
parent 4258f621fcb18820e1ddb382713bab898e4ef913
author Baligh Uddin <baligh@google.com> 1414085269 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085269 +0000

am 4258f621: (-s ours) am 5f4f95ca: (-s ours) am ea8f1f18: (-s ours) am 98989bd7: (-s ours) am 835c0b74: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-indigo-rose

* commit '4258f621fcb18820e1ddb382713bab898e4ef913':