Marco Nelissen ae84e20b2a am 4375e848: am ab962b54: am ab3977d2: Merge "MetadataRetriever: Check null pointer to avoid tombstone crash." ...

* commit '4375e84882a9a84b0012cf9504a30ede6ef72c1f':
  MetadataRetriever: Check null pointer to avoid tombstone crash.

2014-05-01 15:35:31 +00:00

..

java/android

Merge "Fix MediaFocusControl index management for PlayerRecord"

2014-04-30 23:58:02 +00:00

jni

am 4375e848: am ab962b54: am ab3977d2: Merge "MetadataRetriever: Check null pointer to avoid tombstone crash."

2014-05-01 15:35:31 +00:00

lib

resolved conflicts for merge of 4f342e87 to master

2014-04-03 11:51:37 -07:00

mca

Remove deprecated BufferQueue constructor

2014-03-12 17:02:07 -07:00

tests

camera2: Fix broken camera metadata test due to key rename

2014-04-22 16:29:45 -07:00