resolve merge conflicts of eb48f49dd to oc-dev am: 7e37841e4f -s ours
authorPyry Haulos <phaulos@google.com>
Thu, 24 Aug 2017 17:51:13 +0000 (17:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 24 Aug 2017 17:51:13 +0000 (17:51 +0000)
commitd8fb19a69e6b5877595aa6d905c50f879c20314b
treeaad755add28ec91c80292ca2400259fdc25363f0
parent486666b68871f1b734d1b71eb07ec7b946b068ee
parenta8938da88474d5faf6bc496050c2b33018d43eff
resolve merge conflicts of eb48f49dd to oc-dev am: 7e37841e4f  -s ours
am: a8938da884  -s ours

Change-Id: Ia10cbcef9ef8cdc21d6124625632cc9ba20947c4