| commit | 529dfa71c934d9bf727d531c5016dce1c12d7c43 | [log] [tgz] |
|---|---|---|
| author | fionaxu <fionaxu@google.com> | Fri Sep 15 13:52:04 2017 -0700 |
| committer | android-build-team Robot <android-build-team-robot@google.com> | Fri Sep 22 23:04:51 2017 +0000 |
| tree | 8139cc35af4cb92f36d86294b197963039e77ba1 | |
| parent | 93db886071884969af0a39ac9daf9458e355bd23 [diff] |
resolve merge conflicts of 6df58d8da10d to oc-dr1-dev Test: I solemnly swear I tested this conflict resolution. Bug: 65113738 Merged-in: I6bc2d8ba45958eaf09e09e3ea2e57c79e0ac461e Merged-in: I445c7bce01e0bf36214f5f4f6327a0582c774dae Change-Id: I100ef303e5e50ddac12bc2e9f1dbeb21d6b801aa (cherry picked from commit 6e40562a7388a33372b6244462aa86aabaa966c2)