Elliott Hughes 36d10e7994 am 3bfc6e76: am c0d6028f: am a012fee3: am 5d6332e3: Merge "AArch64: Use long for pointers in MediaDrm and MediaMuxer" ...

* commit '3bfc6e76e627d4122a774488f36fb843bb3694fb':
  AArch64: Use long for pointers in MediaDrm and MediaMuxer

2013-12-16 23:27:39 +00:00

..

java/android

am 3bfc6e76: am c0d6028f: am a012fee3: am 5d6332e3: Merge "AArch64: Use long for pointers in MediaDrm and MediaMuxer"

2013-12-16 23:27:39 +00:00

jni

AArch64: Use long for pointers in MediaDrm and MediaMuxer

2013-12-10 18:10:47 +00:00

lib

resolved conflicts for merge of e0b14ea7 to master

2013-12-13 15:59:51 -08:00

mca

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

tests

Camera2: add metadata override

2013-10-07 08:02:25 -07:00