tree 73b07a8490f3ab95a23e31af027199ec31b7c356
parent da1cef3603205d09e1fc07c1ef8dbe3db4f40aef
parent 696601704ecfc23d9f8e4e184b2a78c049add6d7
author Baligh Uddin <baligh@google.com> 1396622682 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396622682 +0000

am 69660170: (-s ours) am 87210ee9: (-s ours) am b2856041: (-s ours) am 81e62eb1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '696601704ecfc23d9f8e4e184b2a78c049add6d7':
  Import translations. DO NOT MERGE