tree 94ce3a430190b27bf9f0ebf40a71f0c73c758368
parent 456a25e50b2fa4c85f14b74801edf6d84b650b20
parent 8a3c0c61e127a75fbc6cf80d74a3056eab6ac94e
author Erik Kline <ek@google.com> 1509097612 +0900
committer Erik Kline <ek@google.com> 1509104995 +0900

resolve merge conflicts of 8a3c0c61e to oc-mr1-dev-plus-aosp

Test: I solemnly swear I tested this conflict resolution.

“Exempt-From-Owner-Approval: fix merge conflict

Change-Id: I15f4f7fbd4198b62483203fca6e0d86d05a5b20a
Merged-In: I8b1ead03fe0b3eadcb803147c0d1890200feee36