OSDN Git Service

Merge changes I4ae01109,Ib45289c3 into oc-dev
authorFan Zhang <zhfan@google.com>
Tue, 25 Apr 2017 20:22:45 +0000 (20:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 25 Apr 2017 20:22:45 +0000 (20:22 +0000)
am: eda3e8c3d9

Change-Id: I897373ce37fd8352edb27ef954b1dc7792ea7026


Trivial merge