Merge changes Iee2918c1,I3a98fe12 into oc-mr1-dev am: 77827f4212
authorMika Isojarvi <misojarvi@google.com>
Wed, 6 Sep 2017 16:48:12 +0000 (16:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 6 Sep 2017 16:48:12 +0000 (16:48 +0000)
commitad867ec734bdee3877d5a78bebd19305b11882c3
treeace40e63c81d3a7210cf0ff878d13355120196d6
parent72d7e058d921c98fcf2f01c195e84623940396df
parent38416f1cf06941bb126780ef25a4ea3f0a156741
Merge changes Iee2918c1,I3a98fe12 into oc-mr1-dev am: 77827f4212
am: 38416f1cf0

Change-Id: I6f94b4279a96332533700c452308dd692cddf6b5