commit | a34d008631ce8f17d1525ce693b49a1b6a05b702 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Jul 15 17:53:46 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 17:53:46 2015 +0000 |
tree | 35bb7fb721b11264c812f8e975b51ebc854b5fe9 | |
parent | 111ece17932967bd882af374f4f4431e6e00afe8 [diff] | |
parent | 4808bdb0119cc6e850b9954f9fbf42efa6ed90bc [diff] |
am 4808bdb0: (-s ours) am 895e581e: (-s ours) am 521e442b: (-s ours) am 040b8559: (-s ours) Import translations. DO NOT MERGE * commit '4808bdb0119cc6e850b9954f9fbf42efa6ed90bc': Import translations. DO NOT MERGE