Narayan Kamath 4dd5c37711 am be8fbb8f: Merge "Remove unused field from MediaMuxer" ...

* commit 'be8fbb8fb63fddac2310dfbafa2594ed165b16b1':
  Remove unused field from MediaMuxer

2013-12-18 10:14:45 -08:00

..

media

am be8fbb8f: Merge "Remove unused field from MediaMuxer"

2013-12-18 10:14:45 -08: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