OSDN Git Service

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

Change-Id: I02a6acca4f15b665cf5b5f3f19d1df07b65264cb


Trivial merge