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