Elliott Hughes a012fee3c3 am 5d6332e3: Merge "AArch64: Use long for pointers in MediaDrm and MediaMuxer" ...

* commit '5d6332e3744e37ced079e5360f1fa3e0e5681d57':
  AArch64: Use long for pointers in MediaDrm and MediaMuxer

2013-12-16 13:01:19 -08:00

..

media

am 5d6332e3: Merge "AArch64: Use long for pointers in MediaDrm and MediaMuxer"

2013-12-16 13:01:19 -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