OSDN Git Service

Merge changes Ifbd1e8d9,I1e017b6f into oc-mr1-dev
authorLorenzo Colitti <lorenzo@google.com>
Tue, 15 Aug 2017 06:56:08 +0000 (06:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 15 Aug 2017 06:56:08 +0000 (06:56 +0000)
commitb18196e02542891595ed982e5e22381893cdd1e9
tree207a5ce266bab702fe2eba3f43a45ffd7dd64495
parent1bce851e8b8ed5ac7c2fa8a93b571097e4443427
parent4faae82855f0bf4e96e478314ed90593ab9094f7
Merge changes Ifbd1e8d9,I1e017b6f into oc-mr1-dev
am: 4faae82855

Change-Id: I0b4b9ee3614aa2d69887f05d0f24e5e2dc379308