| commit | 341f7ea74b30371a464994544244a8e1c0327277 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Mar 26 21:05:32 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 26 21:05:32 2015 +0000 |
| tree | f96c7d6d07aafca9fccc1d8711ab873ec6e475fb | |
| parent | 22f10ac4016c6879f55d65b16765440ff9453f58 [diff] | |
| parent | 8dc2209ebf31bbb99ef1f2eb6d5c4bdf9069b4ce [diff] |
am 8dc2209e: (-s ours) am 3a496eb8: (-s ours) am a2fd9c6c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '8dc2209ebf31bbb99ef1f2eb6d5c4bdf9069b4ce':