OSDN Git Service

Manually merge changes from giant AOSP topic
authorStephen Li <stephenli@google.com>
Thu, 7 Dec 2017 23:44:38 +0000 (23:44 +0000)
committerStephen Li <stephenli@google.com>
Thu, 7 Dec 2017 23:44:38 +0000 (23:44 +0000)
Change-Id: Ib8f588ebe08bac8b557793127a6eea042cf2a653


Trivial merge