OSDN Git Service

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

Change-Id: I8d58a312a5340762a15e1a97f441f08169c85935


Trivial merge