| commit | 48fab9d10ab12fb015e964e0e766091f485843ef | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Sep 30 13:11:18 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 30 13:11:18 2015 +0000 |
| tree | 02193d05aecf182b9eedb4e18447918358f5613b | |
| parent | 722737c43b43a5373ff8fdb21b0e6516ff1886c8 [diff] | |
| parent | 82c45e07c2c6771142ad7b7dffaae23f9151d597 [diff] |
am 82c45e07: (-s ours) am 4446480e: (-s ours) am 0929be66: (-s ours) am dffcc532: (-s ours) am c7b0a816: (-s ours) am 49b491bb: (-s ours) am 2e095fa2: (-s ours) Import translations. DO NOT MERGE * commit '82c45e07c2c6771142ad7b7dffaae23f9151d597': Import translations. DO NOT MERGE