tree 648b1d3d905516553b8a4d7062ab5a96d317d54b
parent f4de7e58aede5cc4b0d1be51905ad54e46ff50ec
parent e38d8212c0db157db42f79192b8d3be41e0503e1
author Baligh Uddin <baligh@google.com> 1426893162 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426893162 +0000

am e38d8212: (-s ours) am afbc99ba: (-s ours) am 368dcbe2: (-s ours) Revert "Import translations. DO NOT MERGE"

* commit 'e38d8212c0db157db42f79192b8d3be41e0503e1':