OSDN Git Service

Merge changes I1d00d86e,I16d81113 into oc-dev
authorJulia Reynolds <juliacr@google.com>
Wed, 19 Apr 2017 13:51:21 +0000 (13:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 19 Apr 2017 13:51:21 +0000 (13:51 +0000)
am: f9db6d3b5f

Change-Id: Ie149b783953ec29ca8867261c852c6e429b004bb


Trivial merge