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