diff options
author | Geoff Mendal <mendal@google.com> | 2014-10-30 23:37:44 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-30 23:37:44 +0000 |
commit | 3fb718302926058e6e960dc14f31c03ac4fa71ad (patch) | |
tree | 8992b6f03e69e745069d2de78e1320ce225b707c | |
parent | 8e88e041354e542ac355b2d2bd7ed7db3ec4634e (diff) | |
parent | 3fe962ec7db9966878c37bff2c13b4afa96f076e (diff) |
am 3fe962ec: (-s ours) am ad6ef4b1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '3fe962ec7db9966878c37bff2c13b4afa96f076e':
Import translations. DO NOT MERGE
0 files changed, 0 insertions, 0 deletions