OSDN Git Service

Merge stage-dr1-aosp-master into stage-aosp-master am: 4a1070631d
authorXin Li <delphij@google.com>
Tue, 14 Aug 2018 01:40:06 +0000 (18:40 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 14 Aug 2018 01:40:06 +0000 (18:40 -0700)
am: b183e8719d

Change-Id: Ic47ece8f4d262c4095a66ad80db7a4d9079292b8


Trivial merge