commit | 6e9612aa314e6aebf2aa3f4594f781083e447daa | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Tue Oct 28 07:13:58 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 28 07:13:58 2014 +0000 |
tree | d599e68d8c59407867911564f9ceb246f1a509ee | |
parent | d79b65b16496f0931de4438deb0a2ad9cf0677f4 [diff] | |
parent | 3e74f147c2f436d946c531e9998377129c92ff1b [diff] |
am 3e74f147: (-s ours) am 33b629c5: (-s ours) am 3a9c1a0f: (-s ours) Import translations. DO NOT MERGE * commit '3e74f147c2f436d946c531e9998377129c92ff1b':