tree cba62d0d64153aa2169651696bc238591341d679
parent cea98f1ab06f24bde00e2fa24f9dbd51ce16eac0
parent b2ad3df7e0e80d589ffaba72330e31585f940252
author Baligh Uddin <baligh@google.com> 1414085131 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085131 +0000

am b2ad3df7: (-s ours) am 192725b0: (-s ours) am 20985b6e: (-s ours) am 1887e80f: (-s ours) am 4082c8c7: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-indigo-rose

* commit 'b2ad3df7e0e80d589ffaba72330e31585f940252':