OSDN Git Service

resolve merge conflicts of 94c5202965 to oc-dr1-dev am: f65e790ba0 -s ours
authorPhil Weaver <pweaver@google.com>
Thu, 31 Aug 2017 18:06:49 +0000 (18:06 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 31 Aug 2017 18:06:49 +0000 (18:06 +0000)
commit60a0a021d1eb5853221d0604e946c1c3dcb1542d
tree48ad50a69650b3346636784245fa0d5d0fc3c706
parent270f217c9f020078bf1d1e5042f88b4114e16856
parent8d9e305d84f6b395e78f573d0878cacb1e6fe3c2
resolve merge conflicts of 94c5202965 to oc-dr1-dev am: f65e790ba0  -s ours
am: 8d9e305d84  -s ours

Change-Id: I97f195764e77daba922c7b855d50e41f29e512c9