| commit | 25966d8ac2b4e2062a36f59d2b2f9c0a0680e24f | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Aug 27 20:22:27 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 20:22:27 2015 +0000 |
| tree | c223dc0587b5c4cbce365eb8c243746e05fa3a4b | |
| parent | db7167a2684e100f5e2f6518860f2e9398eaca2e [diff] | |
| parent | be1dc7440b3f03e795d4cacdf217b576f5a50bfe [diff] |
am be1dc744: (-s ours) am 942137b3: (-s ours) am 0497f6d3: (-s ours) Import translations. DO NOT MERGE * commit 'be1dc7440b3f03e795d4cacdf217b576f5a50bfe':