resolve merge conflicts of 037808f59 to oc-dr1-dev-plus-aosp
authorMika Isojärvi <misojarvi@google.com>
Mon, 25 Sep 2017 15:50:29 +0000 (15:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 25 Sep 2017 15:50:29 +0000 (15:50 +0000)
commit2df030dc65424bc4be265d439d44e307a72ac7b3
tree7bedd9be9b4ad686027a570d41ed45a00a734bb5
parentb1b6c48f4efe47f3e2d4db1f1a1ce4fababea063
parent405ea7d9a5856e8f084fd4654d70d5973aed9069
resolve merge conflicts of 037808f59 to oc-dr1-dev-plus-aosp
am: 405ea7d9a5

Change-Id: I45a9f663e6ca640fe8b9641027aea2494d8b4293