OSDN Git Service

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

Change-Id: I3997875bf9c33f58209687a8b1d18de4a139191c


Trivial merge