tree a4f6093c1594b8a53778e964599baa3565664215
parent 335289aae79b5dc759629a89b97bf059a3d1e466
parent dc5f592c0344e9fc308c68d7d2e80b8b7f82acab
author Baligh Uddin <baligh@google.com> 1386279003 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1386279003 +0000

am dc5f592c: (-s ours) am 78f5ef71: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit 'dc5f592c0344e9fc308c68d7d2e80b8b7f82acab':