| commit | 3e938519e3b11251c5eae308276a7217fb7c6572 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Mar 04 13:47:51 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Mar 04 13:47:51 2015 +0000 |
| tree | 7d5baa6fdc44257dc28edef4cc78070ea8293bc7 | |
| parent | 97735297307eccc3cedb537fe88a2a76d473f798 [diff] | |
| parent | 80b9bd854365bf052db9572bcff0fedf74090ff5 [diff] |
am 80b9bd85: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev * commit '80b9bd854365bf052db9572bcff0fedf74090ff5': Import translations. DO NOT MERGE