| commit | 19aff1e1fddb9fb09640a75d7429568add957905 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Feb 23 14:39:07 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Feb 23 14:39:07 2015 +0000 |
| tree | e1d2a292a41ae8e91858b91b1730b36be9dc9f28 | |
| parent | ae576879b1ee4c93266f957efe5d14353fed91c1 [diff] | |
| parent | 9dd645bdd0512456860a0fec66351dfed966b8c0 [diff] |
am 9dd645bd: (-s ours) am 84cd5f64: (-s ours) am e74331dc: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev * commit '9dd645bdd0512456860a0fec66351dfed966b8c0': Import translations. DO NOT MERGE