diff options
author | Geoff Mendal <mendal@google.com> | 2014-12-04 20:46:01 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-04 20:46:01 +0000 |
commit | 54b4b619b58f4facc2463b79a32e09fed1844f9a (patch) | |
tree | d237d9246e1f9b963d1981f8a951dbae23f8a104 /res | |
parent | 19106acee77a5f0bca27841c3025204c1392fa25 (diff) | |
parent | ea8d08ac8f147535caec8226793eb2577ccda15b (diff) |
am ea8d08ac: (-s ours) am c637febf: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit 'ea8d08ac8f147535caec8226793eb2577ccda15b':
Import translations. DO NOT MERGE
Diffstat (limited to 'res')
0 files changed, 0 insertions, 0 deletions