| commit | de7f5755753567851556709e0eb8911a09b027f7 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 19 13:09:58 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 19 13:09:58 2015 +0000 |
| tree | 1c58c15960acad38ac9c6246a9775a9dba7ab60e | |
| parent | f6f47a212fe4b4102016224712a33c7216cdf92d [diff] | |
| parent | 351e41c09813476cf77f072e07f8b5b7a7ef3ab4 [diff] |
am 351e41c0: (-s ours) am 40d451e4: (-s ours) Import translations. DO NOT MERGE am: 750de1a558 -s ours * commit '351e41c09813476cf77f072e07f8b5b7a7ef3ab4': Import translations. DO NOT MERGE