resolve merge conflicts of 037808f59 to oc-mr1-dev am: 863b6fc0e5
authorMika Isojärvi <misojarvi@google.com>
Sat, 23 Sep 2017 00:12:35 +0000 (00:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 23 Sep 2017 00:12:35 +0000 (00:12 +0000)
commit027055005018a61684b7f56d87f65cf6d9925f07
tree7bedd9be9b4ad686027a570d41ed45a00a734bb5
parent1bb35b7bcc22752fa78a2c4df9bfc60d50c07267
parent3d49d202f716b55a8a52e04a5e0b0ab8c559dbf3
resolve merge conflicts of 037808f59 to oc-mr1-dev am: 863b6fc0e5
am: 3d49d202f7

Change-Id: Ife02ced7620655ee4b6fec718081082e9819d0a1