| commit | b48de758b28cdc34ce1fb307d096d3f6f9cddb57 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jul 13 23:35:31 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 13 23:35:31 2015 +0000 |
| tree | 9af66cab85be5230f3a5274eba8d75ad2313047a | |
| parent | 474f987dd783493967e9ea899398f6965a7d3515 [diff] | |
| parent | d64aa49305123e191a0beda2648010c534ac3ee1 [diff] |
am d64aa493: (-s ours) am c021aaaf: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit 'd64aa49305123e191a0beda2648010c534ac3ee1': Import translations. DO NOT MERGE