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)
am: 54f40fa1e6

Change-Id: I908fe0868bbc85b959e9d41afa709019669131da


Trivial merge