diff options
| author | Geoff Mendal <mendal@google.com> | 2014-12-05 00:13:57 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-05 00:13:57 +0000 |
| commit | b827c875554282fc35611ef35a564c72cbfecb06 (patch) | |
| tree | d237d9246e1f9b963d1981f8a951dbae23f8a104 /res | |
| parent | 54b4b619b58f4facc2463b79a32e09fed1844f9a (diff) | |
| parent | 040db769fc9c31a95ae422c549bde3dd6986fd03 (diff) | |
am 040db769: (-s ours) am 2145b392: (-s ours) am 7b79c351: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '040db769fc9c31a95ae422c549bde3dd6986fd03':
Import translations. DO NOT MERGE
Diffstat (limited to 'res')
0 files changed, 0 insertions, 0 deletions