| commit | 723665d5bd319a8b911dc69c78a7a20a39ee539a | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jan 19 18:13:39 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jan 19 18:13:39 2015 +0000 |
| tree | 0853f2740c83af2763e0eceb94e72ae681680d46 | |
| parent | 4ec6db4126eae2e95022a89a6c606ce6d5600e36 [diff] | |
| parent | 335e34decc8a805e96128dee1d1cec04d7196dda [diff] |
am 335e34de: (-s ours) Merge "Import translations. DO NOT MERGE" * commit '335e34decc8a805e96128dee1d1cec04d7196dda': Import translations. DO NOT MERGE