| commit | 63917040f1143c036ff480cee3e26790eaddb263 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 17:08:32 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 17:08:32 2015 +0000 |
| tree | 156318d1e7602a679e0bb7d9834512a17995ea14 | |
| parent | cc34158af0bf5318a33d74fed3e01de32a62149a [diff] | |
| parent | 74d4fdc31c8b3893c498c26e833eabe86f03fb57 [diff] |
am 74d4fdc3: (-s ours) am 29217bcd: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit '74d4fdc31c8b3893c498c26e833eabe86f03fb57': Import translations. DO NOT MERGE