tree cba62d0d64153aa2169651696bc238591341d679
parent 4e344c28e59e94df5b5647b55924aebcd8817d68
parent 7bfcb956ced721c611b8a441fedf3026b9366481
author Baligh Uddin <baligh@google.com> 1414085129 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085129 +0000

am 7bfcb956: (-s ours) am ecad1b10: (-s ours) am a5b43767: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit

* commit '7bfcb956ced721c611b8a441fedf3026b9366481':