| commit | fb8751fbb8ada21ac7f794149b75db1b8c010ef5 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 29 14:46:57 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 29 14:46:57 2015 +0000 |
| tree | fd1d2fa94975bafa8bc3eca9889d4d5559a1599b | |
| parent | bbe37c5171d39c212c8c7a238876b31b904c7958 [diff] | |
| parent | fc40cbf1022ec45f1768cefe536af248e1a5300c [diff] |
am bb214a94: (-s ours) am 6b8b382f: (-s ours) am e2b3f64e: (-s ours) am ceada86c: (-s ours) Import translations. DO NOT MERGE * commit 'bb214a9447a1589f6a575d6af30cc6ad627da765': Import translations. DO NOT MERGE