Dianne Hackborn 8d717b917c resolved conflicts for merge of 03422d26 to master ...

Change-Id: I5d012fb122224c949a0039450bf0a9a475dc8e82

2013-09-11 16:43:22 -07:00

..

media

resolved conflicts for merge of 03422d26 to master

2013-09-11 16:43:22 -07:00

mtp

Merge "When deleting a db file, Context.deleteDatabase() has to be called instead of File.delete() to guarantee all db related files like journal, wal, shm, etc are deleted together."

2013-08-07 15:39:39 +00:00