OSDN Git Service

Merge changes If30bfa71,Ib8f78967 into oc-dev
authorAlex Vakulenko <avakulenko@google.com>
Wed, 19 Apr 2017 22:35:40 +0000 (22:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 19 Apr 2017 22:35:40 +0000 (22:35 +0000)
commitad1c74c012be0daf0a99a6997de4279fd0b9218c
tree89ed08e7b9ac50e64c46058e59f6edb890300bac
parentc0fe86ff012fa55cc84e51f97ca4577e1f769634
parent1fbefc70dfc5bef14168431e4b443cb6a4d5ceec
Merge changes If30bfa71,Ib8f78967 into oc-dev
am: 1fbefc70df

Change-Id: I077a810a54c33ca97c18912ca6399bcb3552824c