OSDN Git Service

[automerger skipped] resolve merge conflicts of 098e2972201b454de0f95a72636ecd9009dc3...
authorUgo Yu <ugoyu@google.com>
Wed, 11 Sep 2019 17:01:13 +0000 (10:01 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 11 Sep 2019 17:01:13 +0000 (10:01 -0700)
commitdb61bc8978edd0313402d71680b627b7774c6dbc
tree6f330904d3bb4904f4b034f2746f0a057695bfc2
parenta65f859b17745fcaee79d55333808d9d589b0187
parent9bc574c61828717cde7cf00cbd180f237be701f3
[automerger skipped] resolve merge conflicts of 098e2972201b454de0f95a72636ecd9009dc32de to oc-dr1-dev
am: 9bc574c618 -s ours
am skip reason: change_id I18b4a1d8e2cdcd6dd4a300f1dc9e6d3892a3baff with SHA1 a65f859b17 is in history

Change-Id: Iffd5b655457623e328f3cce1a5894d8a611cd417