Narayan Kamath 8907644bb6 am ad1ff472: am 7bbc79fd: am 91f6aaaf: am 2d2d5943: am f3172c62: Merge "MediaDrm#mNativeContext is a long, not int." ...

* commit 'ad1ff47213e1b3a34a2b9e5a189742e9a15ed486':
  MediaDrm#mNativeContext is a long, not int.

2013-12-19 13:14:17 +00:00

..

java/android

am 52ba48a8: am f08b83be: am 4dd5c377: am be8fbb8f: Merge "Remove unused field from MediaMuxer"

2013-12-18 18:25:33 +00:00

jni

Merge "MediaDrm#mNativeContext is a long, not int."

2013-12-19 12:35:24 +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