| commit | c0bbff5bd341ab5e4ef45083ae4a4a25ea1d7063 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 20 21:12:37 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 20 21:12:37 2014 +0000 |
| tree | e5369026136f79657e70661751fe1bf7f962af28 | |
| parent | af175130a3f1a8628aefd7aecd3f06b97c8f94ea [diff] | |
| parent | 8b480ca2b477dbffacce41a4e42f565a0645da02 [diff] |
am a4ef0282: (-s ours) am 94946bbb: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit 'a4ef02826f18fe628cc0d928f2a57e5a0065baa0': Import translations. DO NOT MERGE