| commit | 2facefe648996732c61a8a26c76704faa6d20e56 | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Thu Mar 13 23:43:37 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 13 23:43:37 2014 +0000 |
| tree | 0a7df38dfd420a93ff7ca97cd37196e1842577be | |
| parent | 0a167a98658afdb220ffd62b00d2e65d2baed3d3 [diff] | |
| parent | 00d115a7533df23027f671c90c0ae52684392e4a [diff] |
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.