OSDN Git Service

Merge stage-dr1-aosp-master into stage-aosp-master am: fbc7d27155
authorXin Li <delphij@google.com>
Tue, 14 Aug 2018 01:43:50 +0000 (18:43 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 14 Aug 2018 01:43:50 +0000 (18:43 -0700)
am: 55ce535126

Change-Id: I8a5b2cefa1e2845dc621a1d94816741966070f33


Trivial merge