OSDN Git Service

Merge changes I8eca5f24,I9d79c67c
authorJerry Zhang <zhangjerry@google.com>
Tue, 31 Jan 2017 00:52:48 +0000 (00:52 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 31 Jan 2017 00:52:48 +0000 (00:52 +0000)
am: 54604d9143

Change-Id: I1e364d21949c9d4c16b14e60c630577399cdce05


Trivial merge