resolve merge conflicts of eb48f49dd to oc-dev
authorPyry Haulos <phaulos@google.com>
Wed, 3 May 2017 18:06:48 +0000 (18:06 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 3 May 2017 18:06:48 +0000 (18:06 +0000)
commita8938da88474d5faf6bc496050c2b33018d43eff
tree26a81b3d13bdfd830129f0e252f22c8cc7827765
parentaf56714a9bccf92c091020707bd64ee59cbb43ff
parent7e37841e4fbdc3835da8dc38736c0ec2e2a7fab7
resolve merge conflicts of eb48f49dd to oc-dev
am: 7e37841e4f  -s ours

Change-Id: Id0436a84f2f097836264f593a7154475e1e328ab