OSDN Git Service

Merge changes I36ec1bf3,Ic5f11074 into oc-mr1-dev
authorJorim Jaggi <jjaggi@google.com>
Tue, 29 Aug 2017 11:41:26 +0000 (11:41 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 29 Aug 2017 11:41:26 +0000 (11:41 +0000)
commit5b32ea3dec3dd00f3fabf1a7f5075221d9e796a6
treef74ea8239f2972433d34cbb6d5196db16765e4d5
parent2a43dcbc106660ad3c5eeb17cdf30fc290b5850b
parent54f40fa1e6bdd27e10738d09e1a123ca8c99f412
Merge changes I36ec1bf3,Ic5f11074 into oc-mr1-dev
am: 54f40fa1e6

Change-Id: I908fe0868bbc85b959e9d41afa709019669131da