diff options
| author | Geoff Mendal <mendal@google.com> | 2014-10-28 07:14:28 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-28 07:14:28 +0000 |
| commit | f8c47cc835e8170cebee436813e4001012648cc2 (patch) | |
| tree | f2620243e630d83dc83246132a35db8953074248 | |
| parent | 3dc21303b0819b953024d99ef8c24919594dc49c (diff) | |
| parent | af20f19bee7d917c4037cfd62a3ed5286269df21 (diff) | |
am af20f19b: (-s ours) am 23463caa: (-s ours) am 13db1832: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit 'af20f19bee7d917c4037cfd62a3ed5286269df21':
0 files changed, 0 insertions, 0 deletions