tree c951cd32c1ec93a1346963d709a249111ce0db14
parent 6528410dbdffe76592a156de03200f30191542c5
parent d6ca10b76d2d00d2b60bb186f71b125f917825b0
author Calin Juravle <calin@google.com> 1494285836 +0000
committer android-build-merger <android-build-merger@google.com> 1494285836 +0000

Merge "Do not return an error if the dalvik-cache odex is missing" into oc-dev
am: d6ca10b76d

Change-Id: I0ff52940cbce928720fcdbb08ee0ad2da8a55be0