| commit | fa18dac7980dcf030757fcd9f0cb9774f65e7f6e | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Mar 26 21:05:37 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 26 21:05:37 2015 +0000 |
| tree | f96c7d6d07aafca9fccc1d8711ab873ec6e475fb | |
| parent | 341f7ea74b30371a464994544244a8e1c0327277 [diff] | |
| parent | 116b058bfb410c2c3bf0c9436645c842406d99b5 [diff] |
am 116b058b: (-s ours) am 013b37a7: (-s ours) am a9431f67: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '116b058bfb410c2c3bf0c9436645c842406d99b5':