OSDN Git Service

Merge changes I7f8b5cfd,I68d65028
authorMyles Watson <mylesgw@google.com>
Wed, 12 Dec 2018 05:14:36 +0000 (21:14 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 12 Dec 2018 05:14:36 +0000 (21:14 -0800)
commitb54f76358de61ee1e1bb2501219079e9c82ba37e
tree9c49b973782e2ace97df514a54c832ebc1cb354f
parent42d037fe36f9673657bcd04721dcdc4c4421227f
parent1b29fe6e18f61ecb67d92dad154ca7897da3d37a
Merge changes I7f8b5cfd,I68d65028
am: 1b29fe6e18

Change-Id: I00f505eb8b71e21e6a2bc778e41ee9a0f8e35fc3