| commit | cca7c4f945f4bf1bc2e8d0116d2248898abb2472 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Aug 24 16:37:31 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 24 16:37:31 2015 +0000 |
| tree | 0cf163506926d1a3d266b8e3611606eb3b433a28 | |
| parent | b5a913f9e264b79f5c714d4a590a44dac2ed2cf2 [diff] | |
| parent | 92f43c8eb74722ecedcbda5b2af5daa581f2dd29 [diff] |
am 92f43c8e: (-s ours) am 4e3af2ec: (-s ours) Import translations. DO NOT MERGE * commit '92f43c8eb74722ecedcbda5b2af5daa581f2dd29': Import translations. DO NOT MERGE