| commit | 93d1612d160f3e71c6dead490a36a334f6abb25f | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Aug 13 05:04:41 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 13 05:04:41 2015 +0000 |
| tree | fc908582f07b67e76a71cf51f93bc62d5f00cef1 | |
| parent | e9639b1d0141ce25548105a17eab3e30b6341f1a [diff] | |
| parent | 8a12d17b09281f09adaf6685680f7cb991aef049 [diff] |
am 8a12d17b: (-s ours) am eea96f22: (-s ours) Import translations. DO NOT MERGE * commit '8a12d17b09281f09adaf6685680f7cb991aef049': Import translations. DO NOT MERGE