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)
commit815388af6cd3014b31f9380714f24a3aeec1fcd9
tree8799a5efe8ae9c5b9258320a3358c2df453a6899
parent1ca91b15ba2c5678ecbd2bd649e3ce5b7b3c59e5
parentf9db6d3b5f4f8956935d6129e6d507297c6d0166
Merge changes I1d00d86e,I16d81113 into oc-dev
am: f9db6d3b5f

Change-Id: Ie149b783953ec29ca8867261c852c6e429b004bb