tree 648b1d3d905516553b8a4d7062ab5a96d317d54b
parent b1a3d465d80f44388641f1f3bec6bf497c62e9b1
parent 134663763197dc32b51e94f43ffb7ca323262cac
author Geoff Mendal <mendal@google.com> 1426893167 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426893167 +0000

am 13466376: (-s ours) am ffac0826: (-s ours) am 3375cc7b: (-s ours) Revert "Import translations. DO NOT MERGE"

* commit '134663763197dc32b51e94f43ffb7ca323262cac':