OSDN Git Service

Merge changes I89610b96,I9986cd8c
authorJerry Zhang <zhangjerry@google.com>
Mon, 6 Feb 2017 22:37:57 +0000 (22:37 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 6 Feb 2017 22:37:57 +0000 (22:37 +0000)
am: e4dbaeffd7

Change-Id: Ic545c034d8fe32f0c669645c00d7c577d4a09f0e


Trivial merge