commit | 0fc60a0dd93ff7ed3893df6c19b10eb557fc99a9 | [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> | Thu Sep 21 23:27:09 2017 +0000 |
tree | d175217d76d1fb33ef9c3647ca2c5d2863314580 | |
parent | 7323423845e66ceb97f2d604564d988d9dbf1115 [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)