| commit | 60c3268e8f5917b1d983bdcc3c6f4069377d43a1 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Aug 27 11:21:05 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:21:05 2015 +0000 |
| tree | 8924d31ff2ecb8b544ab35dab62f515aac397156 | |
| parent | 0dc65d746f5ba86f5181c66545fa72ac534a3b18 [diff] | |
| parent | 0dacc415aae90c87321329c1e59463c76a0a6e82 [diff] |
am 0dacc415: (-s ours) am eb0be29e: (-s ours) Import translations. DO NOT MERGE * commit '0dacc415aae90c87321329c1e59463c76a0a6e82':