Marco Nelissen 81fbdade8d resolved conflicts for merge of 534f3e94 to jb-mr1-dev ...

Change-Id: I48ef81bc77d5ececbe9b0cf7d5e905512ca16394

2014-03-20 10:27:58 -07:00

..

java/android

resolved conflicts for merge of 534f3e94 to jb-mr1-dev

2014-03-20 10:27:58 -07:00

jni

Throw an exception instead of crash when a surface does not have a binding surface texture

2012-10-04 09:16:40 -07:00

libdrm

am 6d8f5b75: libdrm: fix bad strncpy / snprintf calls

2013-04-29 15:38:40 -07:00

mca

Fix b/7087723 Patch leftover after tapping the red eye area

2012-09-12 15:01:29 -07:00

tests

Merge "Refactoring the media recorder stress test. Added test cases for: - record & playback @ 1080p - record & playback @ 720p - record & playback @ 480p - record & playback @ custom Plus extending the record duration to a full minute." into jb-mr1-dev

2013-01-07 19:12:11 -08:00