tree 96946133745968edb8e9980107d1a87514f1bd98
parent 9eb7a69e785b490be00d87ffccd4c861507fca50
parent 6dadd3e441ee6791e208491153b471d235335ea1
author Jason Monk <jmonk@google.com> 1504286017 +0000
committer android-build-merger <android-build-merger@google.com> 1504286017 +0000

resolve merge conflicts of e30e3430f936 to oc-mr1-dev-plus-aosp
am: 6dadd3e441

Change-Id: I591148bc1565abffa458f7b968d5bf5abe5019ea