| commit | 50c5d022374e585190016b202059de2046bf53c4 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 22:57:30 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 22:57:30 2015 +0000 |
| tree | 50528d96f58009b20a56ce829998dd206c8c906c | |
| parent | 7208e5ab688192494a634cb1408261f46ccb1ef5 [diff] | |
| parent | 107f6f6acca744782d12e4e9dacc07a05e0acdf1 [diff] |
am 107f6f6a: (-s ours) am 979f4343: (-s ours) am 98f5af66: (-s ours) am 7262e3ae: (-s ours) am d2397fbc: (-s ours) Import translations. DO NOT MERGE * commit '107f6f6acca744782d12e4e9dacc07a05e0acdf1': Import translations. DO NOT MERGE