OSDN Git Service

am 00d115a7: resolved conflicts for merge of aa737c49 to klp-modular-dev-plus-aosp
authorBrian Carlstrom <bdc@google.com>
Thu, 13 Mar 2014 23:43:37 +0000 (23:43 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 13 Mar 2014 23:43:37 +0000 (23:43 +0000)
commit2facefe648996732c61a8a26c76704faa6d20e56
tree0a7df38dfd420a93ff7ca97cd37196e1842577be
parent0a167a98658afdb220ffd62b00d2e65d2baed3d3
parent00d115a7533df23027f671c90c0ae52684392e4a
am 00d115a7: resolved conflicts for merge of aa737c49 to klp-modular-dev-plus-aosp

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