| commit | 244e0b3bfbe39fb3417ab4fd5ab95e34a6bf8cf4 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jul 13 15:25:24 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 13 15:25:24 2015 +0000 |
| tree | 2f08df22f31e3a6cac5d01c0c56244f65e422e21 | |
| parent | 9c2e61b47a9c7eb4062d0296b9d907c46fc6bf54 [diff] | |
| parent | 389f27aa912dbdf6aa2c1724b4410d4aad318b56 [diff] |
am 389f27aa: (-s ours) am bb8c1043: (-s ours) Import translations. DO NOT MERGE * commit '389f27aa912dbdf6aa2c1724b4410d4aad318b56': Import translations. DO NOT MERGE