OSDN Git Service

[automerger skipped] resolve merge conflicts of 098e2972201b454de0f95a72636ecd9009dc3...
authorUgo Yu <ugoyu@google.com>
Wed, 11 Sep 2019 17:29:24 +0000 (10:29 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 11 Sep 2019 17:29:24 +0000 (10:29 -0700)
commitfbb1ea4e9bebad133dcee0ca21bcde9837b312a0
tree22398747e22e1830878e43ed753f352dd10afbbe
parentadea7f4415a064546054b832f37ee652ea9c748e
parent5c3e64afe77fbc8b5ddffdedf737fe8258296005
[automerger skipped] resolve merge conflicts of 098e2972201b454de0f95a72636ecd9009dc32de to oc-dr1-dev am: 9bc574c618 -s ours am: db61bc8978 -s ours am: 40ac062848 -s ours am: ee56071b66 -s ours
am: 5c3e64afe7 -s ours
am skip reason: change_id I18b4a1d8e2cdcd6dd4a300f1dc9e6d3892a3baff with SHA1 a65f859b17 is in history

Change-Id: I8cb0925a5a44e504051ee0970013dc1fc8bf7ae1