tree 51cd24518b1e35875755d3f2a1b01d969afbd2d2
parent 2e3f39c62a6b2036a023b8d9124cd2d4ddfecbe8
parent 0c066cc32aa8652a59b9a1693e2affec57d0fad0
author Baligh Uddin <baligh@google.com> 1398862468 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1398862468 +0000

am 0c066cc3: (-s ours) am cd96200a: (-s ours) am ace17549: (-s ours) am c1f2a213: (-s ours) am ea8ec3cd: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '0c066cc32aa8652a59b9a1693e2affec57d0fad0':