| commit | 8e89371fe7fd60eba93ca679c7d78ce0dfff2fa2 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Aug 27 21:18:59 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 21:18:59 2015 +0000 |
| tree | 81798b1ad31ede456c07ec28698c8df00fc83ed7 | |
| parent | 39d1460ac812ddc18876cb37e7e4590e8be71fb2 [diff] | |
| parent | 949feef406075e4e1e1ce83836831e43049f026d [diff] |
am 949feef4: (-s ours) am 6df87bc9: (-s ours) am d6d398e6: (-s ours) Import translations. DO NOT MERGE * commit '949feef406075e4e1e1ce83836831e43049f026d':