resolve merge conflicts of 037808f59 to oc-mr1-dev
authorMika Isojärvi <misojarvi@google.com>
Sat, 23 Sep 2017 00:10:38 +0000 (00:10 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 23 Sep 2017 00:10:38 +0000 (00:10 +0000)
commit3d49d202f716b55a8a52e04a5e0b0ab8c559dbf3
tree7bedd9be9b4ad686027a570d41ed45a00a734bb5
parent9c9d47f7f616d3be450af26cdc3615d548f7799e
parent863b6fc0e5406d6069b4a6ff41d11e330858a33f
resolve merge conflicts of 037808f59 to oc-mr1-dev
am: 863b6fc0e5

Change-Id: I6e195a2d90507f9d358e3fe3cf50cc78446bfadc