OSDN Git Service

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


Trivial merge