Narayan Kamath 91f6aaaf2c am 2d2d5943: am f3172c62: Merge "MediaDrm#mNativeContext is a long, not int." ...

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

2013-12-19 05:01:34 -08:00

..

java/android

am be8fbb8f: Merge "Remove unused field from MediaMuxer"

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

jni

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

2013-12-19 12:35:24 +00:00

lib

Use java.util.Objects instead on internal API

2013-12-13 13:40:30 -08:00

mca

fix-up dependencies to gl headers

2013-08-08 21:09:16 -07:00

tests

Camera2: add metadata override

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