summaryrefslogtreecommitdiff
path: root/docs/html/sdk/api_diff/12/changes
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2014-11-27 10:09:46 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-27 10:09:46 +0000
commitff45e7df8aae0f55ce719de92102c7d522b62048 (patch)
treee29fee311b114f840749eb8d171bf75ffbe0793a /docs/html/sdk/api_diff/12/changes
parentb957d11a5375e05b4e6c06c4c8d472d3c472caf7 (diff)
parent1d184acefa7105592134edebf7de4d77843d5791 (diff)
am 1d184ace: resolved conflicts for merge of 7377998d to lmp-mr1-dev
* commit '1d184acefa7105592134edebf7de4d77843d5791': Be increasingly aggressive about fstrim if it isn't being run
Diffstat (limited to 'docs/html/sdk/api_diff/12/changes')
0 files changed, 0 insertions, 0 deletions