| commit | 54b1a485266a175dffd78a5aae7c5426cb5131b1 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Nov 25 15:21:40 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 25 15:21:40 2014 +0000 |
| tree | 01f306db3cae806354b6acc1ad58694450d4dfaf | |
| parent | 3bca638eeda9e0cb2867598b6fc6a232e6779abb [diff] | |
| parent | 24c2a22a775fe1b8225da45f1e539758a93dc42f [diff] |
am 24c2a22a: (-s ours) am a0a8df13: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev * commit '24c2a22a775fe1b8225da45f1e539758a93dc42f': Import translations. DO NOT MERGE