| commit | 87734fa8c3ba05b7c16aa05be06006a6cb1e8e49 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Aug 27 11:28:30 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:28:30 2015 +0000 |
| tree | edb91ce7e7c9dc6d33389277e2e2adcac1d36854 | |
| parent | dcf1904b2e5716063e5b890ce94f0358ec761f07 [diff] | |
| parent | 0283bd910268fec571b6e918778d352f92e06e7e [diff] |
am 0283bd91: (-s ours) am c8e261e9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit '0283bd910268fec571b6e918778d352f92e06e7e':