| commit | cdeeecb05607f302a306929c806dece0332eb182 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Aug 19 16:24:41 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 19 16:24:41 2015 +0000 |
| tree | b9a95901e05790512a3df9f10835f83501a02360 | |
| parent | 4caf6b9784d0102844f74ea65da75affc0750896 [diff] | |
| parent | 37aa01a34da149fa893e731032fd0aee32321396 [diff] |
am 37aa01a3: (-s ours) am 399237f8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev * commit '37aa01a34da149fa893e731032fd0aee32321396': Import translations. DO NOT MERGE