tree 648b1d3d905516553b8a4d7062ab5a96d317d54b
parent a734dab33660ff209b92b3cd9fad31d0f7ae19d2
parent f64541d1651cc8527e4bfd94807f826dfe56e537
author Geoff Mendal <mendal@google.com> 1426893166 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426893166 +0000

am f64541d1: (-s ours) am db057927: (-s ours) am 75f56445: (-s ours) Import translations. DO NOT MERGE

* commit 'f64541d1651cc8527e4bfd94807f826dfe56e537':