| commit | c93cf92bad9753749b13e7094311096fc4c070e6 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Fri Mar 27 23:03:53 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 27 23:03:53 2015 +0000 |
| tree | 948c62949800d6ff28ef0ceb1058b14b72634c97 | |
| parent | db12adc2f8ee2a6cf02cba4c4520b59d17869e23 [diff] | |
| parent | ef224cf62d2b522099fe0ae3b66e2189d2e9ac38 [diff] |
am ef224cf6: (-s ours) Merge "Import translations. DO NOT MERGE" * commit 'ef224cf62d2b522099fe0ae3b66e2189d2e9ac38': Import translations. DO NOT MERGE