| commit | 3396d450532876c6be5883a854d90142aadb67f8 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 06 23:58:28 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 06 23:58:28 2014 +0000 |
| tree | ae58a0b11552898f2cf79f87ee323d4d62d36063 | |
| parent | d692a74d3944f1d575c62e6ba9e06445116e0902 [diff] | |
| parent | 63c6e5c5d21688943650abda7818ea7017eabb02 [diff] |
am 63c6e5c5: (-s ours) am 85813c44: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev * commit '63c6e5c5d21688943650abda7818ea7017eabb02': Import translations. DO NOT MERGE