| commit | ea07d1cbb4df4257fbff3b3fe66bdf84e2c1ea9e | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Apr 28 14:50:00 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 28 14:50:00 2015 +0000 |
| tree | 3f2a8ebe405dac91ec711c6efc9502539f854ca5 | |
| parent | 7825b9d01c4721b5d2134c00521d1d92d1799d94 [diff] | |
| parent | b268f6064239ca30749e77db86200c4627f0d93a [diff] |
am b268f606: (-s ours) am d727677d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit 'b268f6064239ca30749e77db86200c4627f0d93a': Import translations. DO NOT MERGE