OSDN Git Service

Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
authorXin Li <delphij@google.com>
Wed, 15 Nov 2017 01:24:18 +0000 (01:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 15 Nov 2017 01:24:18 +0000 (01:24 +0000)
am: 7941c5b1c7

Change-Id: I94fcdd95e26361328411ea71c02f6baadeac230d


Trivial merge