| commit | 63cfac44f07cf458f94a3fa10d252426017f7061 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | Thu Jan 25 22:35:48 2018 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jan 25 22:35:48 2018 +0000 |
| tree | cddcc3e030137a8f1fd5e16a339b31f34fade1bd | |
| parent | 61c4d63c9837c2781039c53ee027bd9723a769da [diff] | |
| parent | c3653152b33ec84aac7777a8cb5110dcbe9f405c [diff] |
Merge changes from topic "am-d53588def0a94e089fd73c9ebe97efe7" into oc-mr1-dev-plus-aosp * changes: Merge changes from topic "am-37557a04-fa85-46fe-a499-4a0280811f3e" into oc-dev am: bcf3392856 am: 0fe900767e am: 5e991b9ef8 [automerger skipped] Import translations. DO NOT MERGE skipped: 39a33e2ffb skipped: 2e4c69a707 am: d7b199be9a -s ours am: 4dfc160224 -s ours am: 4685af2a89 -s ours