| commit | ab2f478b6c845835d9472bcc0e6e7810f86ff5af | [log] [tgz] |
|---|---|---|
| author | Vladimir Ermoshkin <vermishkin@google.com> | Mon Mar 25 12:01:24 2019 -0700 |
| committer | Vladimir Ermoshkin <vermishkin@google.com> | Mon Mar 25 21:54:42 2019 +0000 |
| tree | 02ca54209b953b0c8f606c245dedf08e3be6c206 | |
| parent | 3ceaaeb741adfc5f1581510accfa961db2ade276 [diff] | |
| parent | 5e74a469e4748e8bf01a2abe742918fd6a0a443b [diff] |
resolve merge conflicts of 5e74a469e4748e8bf01a2abe742918fd6a0a443b to oc-dr1-dev Bug: 129068851 Test: I solemnly swear I tested this conflict resolution. Change-Id: If35cc7dabe8e555f24e48914edc397b966c149bc Merged-In: I9b062a9b6b4f7458e96ca501c22d66e8957a7cb4