tree ee9b29151b6e6467ad5bb1654e27f12f675c61df
parent ca37ce73d9f6e64e4cc7c58de4d1f0952b834bd3
parent b77e9e9f326ca490218b5df68978e5d834cd6f6a
author JP Sugarbroad <jpsugar@google.com> 1501015874 +0000
committer android-build-merger <android-build-merger@google.com> 1501015874 +0000

resolve merge conflicts of 0f98d87 to oc-dr1-dev
am: b77e9e9f32  -s ours

Change-Id: I91bef19b954d2db027139bb2b95bcb839eaa9ab1