commit | 1c95645b3bbc55db50d5720e29a2b867d849d0f8 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Mon Oct 19 13:17:46 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 19 13:17:46 2015 +0000 |
tree | 7c393e532652b1cf4d5372e9073dbea6fb38c01c | |
parent | 6d85d1686e6a333fe990d9e3ae5b978e8a8ce8c2 [diff] | |
parent | ca059bfb439df9db2c4ee2f7d860e8a29bf0a91f [diff] |
am ca059bfb: (-s ours) am 51b43e12: (-s ours) am 99131cf6: (-s ours) am f191953c: (-s ours) Import translations. DO NOT MERGE am: 862568de0d -s ours * commit 'ca059bfb439df9db2c4ee2f7d860e8a29bf0a91f': Import translations. DO NOT MERGE