am dbc5c711: Merge "(GB/GBMR) (do not merge) delete file from disk when deleting...
authorVasu Nori <vnori@google.com>
Sun, 16 Jan 2011 21:20:18 +0000 (13:20 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sun, 16 Jan 2011 21:20:18 +0000 (13:20 -0800)
commita13a82c1be907673623268ccce15e9552877fec1
tree2d2f38773ce20c676d67738a26fa47dfcf3801b6
parent5e69e69e20a0e0dfcf1ea81c8ab06901f3507ba4
parentdbc5c7118e00932182b0f5dfef44d388a174d4d5
am dbc5c711: Merge "(GB/GBMR) (do not merge) delete file from disk when deleting from db" into gingerbread

* commit 'dbc5c7118e00932182b0f5dfef44d388a174d4d5':
  (GB/GBMR) (do not merge) delete file from disk when deleting from db