tree af39ceb9c6cb26c3ee1ea02c1e03de9a2486ac93
parent 87c11fd27ccd4c7fea6c4d109e3b766c878864d1
parent 47467f8626cbf307880c022418263afed331759b
author Baligh Uddin <baligh@google.com> 1398862203 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1398862203 +0000

am 47467f86: (-s ours) am d601e973: (-s ours) am 61365506: (-s ours) am 366822da: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '47467f8626cbf307880c022418263afed331759b':