Merge changes Iee2918c1,I3a98fe12 into oc-mr1-dev
authorMika Isojarvi <misojarvi@google.com>
Wed, 6 Sep 2017 16:40:54 +0000 (16:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 6 Sep 2017 16:40:54 +0000 (16:40 +0000)
commit38416f1cf06941bb126780ef25a4ea3f0a156741
treeace40e63c81d3a7210cf0ff878d13355120196d6
parent1cb1df235dead9dd61cac833f5b67e7f61d7f256
parent77827f42127638d664c9f96a2851e4401473d28a
Merge changes Iee2918c1,I3a98fe12 into oc-mr1-dev
am: 77827f4212

Change-Id: I26434955a5eb8f2648ceb3f082374db627d358f4