tree c9f7cebda5c808598132dd832dbd91706f18e4dc
parent 73dca274796dc6c8a2e59e19d7ee59fe529f678d
parent 2facefe648996732c61a8a26c76704faa6d20e56
author Brian Carlstrom <bdc@google.com> 1394802814 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394802814 +0000

am 2facefe6: am 00d115a7: resolved conflicts for merge of aa737c49 to klp-modular-dev-plus-aosp

* commit '2facefe648996732c61a8a26c76704faa6d20e56':
  DO NOT MERGE - Remove data dirs if a new install fails dexopt.