| commit | 1c307b4ff67016e30a9951cf4de95283847bb7dd | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 17:03:08 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 17:03:08 2015 +0000 |
| tree | 2f08df22f31e3a6cac5d01c0c56244f65e422e21 | |
| parent | 244e0b3bfbe39fb3417ab4fd5ab95e34a6bf8cf4 [diff] | |
| parent | 28d342d4a5438520baad89522490c8d9310b07c1 [diff] |
am 28d342d4: (-s ours) am f30b80f2: (-s ours) am baf687ff: (-s ours) Import translations. DO NOT MERGE * commit '28d342d4a5438520baad89522490c8d9310b07c1': Import translations. DO NOT MERGE