OSDN Git Service

Merge stage-dr1-aosp-master into stage-aosp-master
authorXin Li <delphij@google.com>
Tue, 14 Aug 2018 00:34:03 +0000 (17:34 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 14 Aug 2018 00:34:03 +0000 (17:34 -0700)
am: 4a1070631d

Change-Id: Ibb1ff890d503003aadde778d308c5918b8a7f06e


Trivial merge