| commit | 9a7892e81c863180cc7db3fc450aded8b8232058 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu May 14 06:56:08 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 14 06:56:08 2015 +0000 |
| tree | f8545c85b7c630969b311f5144c93d0edbcf7e26 | |
| parent | adfbb2c3b140498cf3856cda9d1f6dd3c792b37a [diff] | |
| parent | d0944a08c2127b3bc1eb91d426fbf3ea6ea68681 [diff] |
am d0944a08: (-s ours) am d98a0554: (-s ours) am 39ab347f: (-s ours) Import translations. DO NOT MERGE * commit 'd0944a08c2127b3bc1eb91d426fbf3ea6ea68681': Import translations. DO NOT MERGE