| commit | ac71889dfbf17d4bbe2c8738d06b670776774614 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Apr 22 12:53:38 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 22 12:53:38 2015 +0000 |
| tree | c82d17e5ca4de615e1882c7b0bbe16767d690584 | |
| parent | a32cd48a5c25d4cfb5519ec3d61530a8979ac13e [diff] | |
| parent | 0ff42b7f7802dacf0e67b2e64898ac2245a863ac [diff] |
am 0ff42b7f: (-s ours) Merge "Import translations. DO NOT MERGE" * commit '0ff42b7f7802dacf0e67b2e64898ac2245a863ac': Import translations. DO NOT MERGE