| commit | 35384e00ba7a88834a2fafd4d2c4e6c46a9fe522 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Dec 09 22:23:10 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 09 22:23:10 2014 +0000 |
| tree | 17c20b02ee7d8a65d2ae1f2f0413233f79dcd2eb | |
| parent | 089c6d79e3b6ad5d1f9503941cb9376596871268 [diff] | |
| parent | 0d77548cda02c3ab2e37d13cfc2edf57239c4372 [diff] |
am 0d77548c: (-s ours) am 654d8805: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev * commit '0d77548cda02c3ab2e37d13cfc2edf57239c4372': Import translations. DO NOT MERGE