| commit | 06e83b3d5ac9a7ec43ddd0ea9d1bf40c13e35484 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Nov 26 18:45:04 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 26 18:45:04 2014 +0000 |
| tree | 53f8b0ec93621065f552d6bd5ac78f210ec5e75b | |
| parent | 228e2c262782d57a365a357a067bb53d13ff5eb9 [diff] | |
| parent | d075d2f7594df21c94bae63bce4ed4d797baaef8 [diff] |
am d075d2f7: (-s ours) am 038c1444: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit 'd075d2f7594df21c94bae63bce4ed4d797baaef8': Import translations. DO NOT MERGE