commit | 969cc7a40e14b7713e9622973681e5a5f991b63d | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Mon Jun 01 17:09:15 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 01 17:09:15 2015 +0000 |
tree | 35bb7fb721b11264c812f8e975b51ebc854b5fe9 | |
parent | 13a1fda4ca87d6ecb818d146fa9f0fb9509be258 [diff] | |
parent | 6097c0cb456cd8acc9f3945d5686a5faad9a57b6 [diff] |
am 6097c0cb: (-s ours) am 0f308b47: (-s ours) Import translations. DO NOT MERGE * commit '6097c0cb456cd8acc9f3945d5686a5faad9a57b6': Import translations. DO NOT MERGE