OSDN Git Service

DO NOT MERGE: Merge Oreo MR1 into master am: a5d45aa1dd -s ours
authorXin Li <delphij@google.com>
Thu, 7 Dec 2017 07:22:01 +0000 (07:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 7 Dec 2017 07:22:01 +0000 (07:22 +0000)
commit9b699fdb991b2efbb4a59bf78f7e5688771b63b1
treeb5a50730d5f11f22c3136a496a37676893b346d9
parent666ee70f8f3a8a4e0ca19853a7e5abeb93234d44
parentd10f572af0df8ccf6338ae798e8042a1f4826e93
DO NOT MERGE: Merge Oreo MR1 into master am: a5d45aa1dd  -s ours
am: d10f572af0

Change-Id: I43324aefa900fe2a70aec620ab22b9b5b0737e36