OSDN Git Service

am 2df4b6a0: am 2facefe6: am 00d115a7: resolved conflicts for merge of aa737c49 to...
authorBrian Carlstrom <bdc@google.com>
Fri, 14 Mar 2014 13:21:28 +0000 (06:21 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 14 Mar 2014 13:21:28 +0000 (06:21 -0700)
commitc0429008a826d9c5b82f272496a882a0ede81ada
tree3ee0db545616bc8cdac37a6a1c6564d027f67d8f
parent2e30d773dc3bfb454cf17df890573bf252d001b0
parent2df4b6a050452c48a31a9543e63388d4fc2433ba
am 2df4b6a0: am 2facefe6: am 00d115a7: resolved conflicts for merge of aa737c49 to klp-modular-dev-plus-aosp

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